Merge tag 'powerpc-3.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

[linux-drm-fsl-dcu.git] / arch / powerpc / kernel / smp.c

diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 8b2d2dc8ef106ef780c9a145335e9de17b3879a7..6e19afa35a153d2736af94bc845008d724fe735f 100644 (file)
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -434,20 +434,6 @@ void generic_cpu_die(unsigned int cpu)
        printk(KERN_ERR "CPU%d didn't die...\n", cpu);
 }
 
-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);
-       __this_cpu_write(cpu_state, CPU_DEAD);
-       smp_wmb();
-       while (__this_cpu_read(cpu_state) != CPU_UP_PREPARE)
-               cpu_relax();
-}
-
 void generic_set_cpu_dead(unsigned int cpu)
 {
        per_cpu(cpu_state, cpu) = CPU_DEAD;