1 files changed, 4 insertions, 8 deletions

diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 7b59cfb7e602..8bf88faf5afd 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -163,8 +163,10 @@ static void stop_this_cpu(void *dummy)
          * Remove this CPU:
          */
         cpu_clear(smp_processor_id(), cpu_online_map);
-        local_irq_enable();     /* May need to service _machine_restart IPI */
-        for (;;);               /* Wait if available. */
+        for (;;) {
+                if (cpu_wait)
+                        (*cpu_wait)();          /* Wait if available. */
+        }
 }
 
 void smp_send_stop(void)
@@ -193,12 +195,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 /* preload SMP state for boot cpu */
 void __devinit smp_prepare_boot_cpu(void)
 {
-        /*
-         * This assumes that bootup is always handled by the processor
-         * with the logic and physical number 0.
-         */
-        __cpu_number_map[0] = 0;
-        __cpu_logical_map[0] = 0;
         cpu_set(0, phys_cpu_present_map);
         cpu_set(0, cpu_online_map);
         cpu_set(0, cpu_callin_map);