Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[~andy/linux] / arch / mips / kernel / smp.c

diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 596620dd7ee2dd8bcd2b0c28d21ab2030575dba2..c17619fe18e32a9f23a5df7e18b0b943b5d0cf2c 100644 (file)
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -140,7 +140,7 @@ asmlinkage __cpuinit void start_secondary(void)
        WARN_ON_ONCE(!irqs_disabled());
        mp_ops->smp_finish();
 
-       cpu_idle();
+       cpu_startup_entry(CPUHP_ONLINE);
 }
 
 /*