From f75fddcdef580e047aa6fe9d01f16ab82891257e Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu, 10 Feb 2011 18:46:50 +1100
Subject: [PATCH] --- yaml --- r: 243581 b: refs/heads/master c:
 4fcb8833af3355065bd8bffcd338eabc6f3a38a0 h: refs/heads/master i:   243579:
 b3a1e532eb0f4760d771fde9ca6c2a2f1e8b5f20 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/powerpc/kernel/smp.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d3de1e852303..11bba160d257 100644
--- 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
index 1c9956c43801..3c0fab5e1e16 100644
--- 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