1 files changed, 1 insertions, 6 deletions

diff --git a/arch/mn10300/kernel/smp.c b/arch/mn10300/kernel/smp.c
index 5d7e152a23b7..a17f9c9c14c9 100644
--- a/arch/mn10300/kernel/smp.c
+++ b/arch/mn10300/kernel/smp.c
@@ -675,7 +675,7 @@ int __init start_secondary(void *unused)
 #ifdef CONFIG_GENERIC_CLOCKEVENTS
         init_clockevents();
 #endif
-        cpu_idle();
+        cpu_startup_entry(CPUHP_ONLINE);
         return 0;
 }
 
@@ -935,8 +935,6 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle)
         int timeout;
 
 #ifdef CONFIG_HOTPLUG_CPU
-        if (num_online_cpus() == 1)
-                disable_hlt();
         if (sleep_mode[cpu])
                 run_wakeup_cpu(cpu);
 #endif /* CONFIG_HOTPLUG_CPU */
@@ -1003,9 +1001,6 @@ int __cpu_disable(void)
 void __cpu_die(unsigned int cpu)
 {
         run_sleep_cpu(cpu);
-
-        if (num_online_cpus() == 1)
-                enable_hlt();
 }
 
 #ifdef CONFIG_MN10300_CACHE_ENABLED