Merge tag 'cpumask-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / arch / mips / kernel / smp.c

diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 357acd3ac0e66efbf785b5548d5c6d90f10945f5..193ace7955fb5eec377b666db534d76173a014c5 100644 (file)
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -176,10 +176,8 @@ static void stop_this_cpu(void *dummy)
         * Remove this CPU:
         */
        set_cpu_online(smp_processor_id(), false);
-       for (;;) {
-               if (cpu_wait)
-                       (*cpu_wait)();          /* Wait if available. */
-       }
+       local_irq_disable();
+       while (1);
 }
 
 void smp_send_stop(void)