---

yaml --- r: 243581 b: refs/heads/master c: 4fcb883 h: refs/heads/master i: 243579: b3a1e53 v: v3
git-mirror · Apr 1, 2011 · f75fddc · f75fddc
1 parent ace5efa
commit f75fddc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa3f82c8bb7acbe049ea71f258b3ae0a33d9d40b
+refs/heads/master: 4fcb8833af3355065bd8bffcd338eabc6f3a38a0
diff --git a/trunk/arch/powerpc/kernel/smp.c b/trunk/arch/powerpc/kernel/smp.c
@@ -362,14 +362,13 @@ void generic_mach_cpu_die(void)
 	unsigned int cpu;
 
 	local_irq_disable();
+	idle_task_exit();
 	cpu = smp_processor_id();
 	printk(KERN_DEBUG "CPU%d offline\n", cpu);
 	__get_cpu_var(cpu_state) = CPU_DEAD;
 	smp_wmb();
 	while (__get_cpu_var(cpu_state) != CPU_UP_PREPARE)
 		cpu_relax();
-	set_cpu_online(cpu, true);
-	local_irq_enable();
 }
 #endif