---

yaml --- r: 106795 b: refs/heads/master c: 0432158 h: refs/heads/master i: 106793: c0e6553 106791: 66017ec v: v3
git-mirror · Jul 28, 2008 · 9b970c2 · 9b970c2
1 parent 80c29f3
commit 9b970c2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffdb5976c47609c862917d4c186ecbb5706d2dda
+refs/heads/master: 04321587584272f4e8b9818f319f40caf8eeee13
diff --git a/trunk/kernel/cpu.c b/trunk/kernel/cpu.c
@@ -250,15 +250,15 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen)
 	set_cpus_allowed_ptr(current, &tmp);
 
 	err = __stop_machine_run(take_cpu_down, &tcd_param, cpu);
-
-	if (err || cpu_online(cpu)) {
+	if (err) {
 		/* CPU didn't die: tell everyone.  Can't complain. */
 		if (raw_notifier_call_chain(&cpu_chain, CPU_DOWN_FAILED | mod,
 					    hcpu) == NOTIFY_BAD)
 			BUG();
 
 		goto out_allowed;
 	}
+	BUG_ON(cpu_online(cpu));
 
 	/* Wait for it to sleep (leaving idle task). */
 	while (!idle_cpu(cpu))