3 files changed, 2 insertions, 19 deletions

diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index bcd17b206571..af814fe478ae 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -13,6 +13,7 @@ config M32R
         select VIRT_TO_BUS
         select GENERIC_IRQ_PROBE
         select GENERIC_IRQ_SHOW
+        select GENERIC_IDLE_LOOP
         select GENERIC_ATOMIC64
         select ARCH_USES_GETTIMEOFFSET
         select MODULES_USE_ELF_RELA
diff --git a/arch/m32r/kernel/process.c b/arch/m32r/kernel/process.c
index bde899e155d3..e2d049018c3b 100644
--- a/arch/m32r/kernel/process.c
+++ b/arch/m32r/kernel/process.c
@@ -47,24 +47,6 @@ unsigned long thread_saved_pc(struct task_struct *tsk)
 void (*pm_power_off)(void) = NULL;
 EXPORT_SYMBOL(pm_power_off);
 
-/*
- * The idle thread. There's no useful work to be
- * done, so just try to conserve power and have a
- * low exit latency (ie sit in a loop waiting for
- * somebody to say that they'd like to reschedule)
- */
-void cpu_idle (void)
-{
-        /* endless idle loop with no priority at all */
-        while (1) {
-                rcu_idle_enter();
-                while (!need_resched())
-                        cpu_relax();
-                rcu_idle_exit();
-                schedule_preempt_disabled();
-        }
-}
-
 void machine_restart(char *__unused)
 {
 #if defined(CONFIG_PLAT_MAPPI3)
diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c
index 13168a769f8f..0ac558adc605 100644
--- a/arch/m32r/kernel/smpboot.c
+++ b/arch/m32r/kernel/smpboot.c
@@ -432,7 +432,7 @@ int __init start_secondary(void *unused)
          */
         local_flush_tlb_all();
 
-        cpu_idle();
+        cpu_startup_entry(CPUHP_ONLINE);
         return 0;
 }