---

yaml --- r: 223999 b: refs/heads/master c: 51a96c7 h: refs/heads/master i: 223997: 10868aa 223995: cd03ad3 223991: 0d93270 223983: 4c2204d 223967: 32f3822 223935: 739b857 223871: 9124936 223743: 63afd0d v: v3
git-mirror · Nov 23, 2010 · 643b982 · 643b982
1 parent c4010fa
commit 643b982
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e01f4740a874b6085da6ebf541e7ffde9a72bf2
+refs/heads/master: 51a96c77815e7f139892a6e9c8275a50e9baebdf
diff --git a/trunk/kernel/cpu.c b/trunk/kernel/cpu.c
@@ -249,8 +249,11 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen)
 	 * The migration_call() CPU_DYING callback will have removed all
 	 * runnable tasks from the cpu, there's only the idle task left now
 	 * that the migration thread is done doing the stop_machine thing.
+	 *
+	 * Wait for the stop thread to go away.
 	 */
-	BUG_ON(!idle_cpu(cpu));
+	while (!idle_cpu(cpu))
+		cpu_relax();
 
 	/* This actually kills the CPU. */
 	__cpu_die(cpu);