Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild...

[linux-2.6-omap-h63xx.git] / arch / mips / kernel / smp.c

diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 4410f172b8abf055ca4f0bc8c339dca673d90854..8bf88faf5afdcb5e7eca6923fa5f4d41f988880e 100644 (file)
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -121,6 +121,8 @@ asmlinkage __cpuinit void start_secondary(void)
        cpu = smp_processor_id();
        cpu_data[cpu].udelay_val = loops_per_jiffy;
 
+       notify_cpu_starting(cpu);
+
        mp_ops->smp_finish();
        set_cpu_sibling_map(cpu);
 
@@ -161,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)
@@ -191,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);