3 files changed, 5 insertions, 21 deletions

diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index e4decc6b8947..6e3710e84a6c 100644
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -24,6 +24,7 @@ config HEXAGON
         select NO_IOPORT
         select GENERIC_IOMAP
         select GENERIC_SMP_IDLE_THREAD
+        select GENERIC_IDLE_LOOP
         select STACKTRACE_SUPPORT
         select KTIME_SCALAR
         select GENERIC_CLOCKEVENTS
diff --git a/arch/hexagon/kernel/process.c b/arch/hexagon/kernel/process.c
index 06ae9ffcabd5..9b948c619a03 100644
--- a/arch/hexagon/kernel/process.c
+++ b/arch/hexagon/kernel/process.c
@@ -51,28 +51,11 @@ void start_thread(struct pt_regs *regs, unsigned long pc, unsigned long sp)
  *  If hardware or VM offer wait termination even though interrupts
  *  are disabled.
  */
-static void default_idle(void)
+void arch_cpu_idle(void)
 {
         __vmwait();
-}
-
-void (*idle_sleep)(void) = default_idle;
-
-void cpu_idle(void)
-{
-        while (1) {
-                tick_nohz_idle_enter();
-                local_irq_disable();
-                while (!need_resched()) {
-                        idle_sleep();
-                        /*  interrupts wake us up, but aren't serviced  */
-                        local_irq_enable();     /* service interrupt   */
-                        local_irq_disable();
-                }
-                local_irq_enable();
-                tick_nohz_idle_exit();
-                schedule();
-        }
+        /*  interrupts wake us up, but irqs are still disabled */
+        local_irq_enable();
 }
 
 /*
diff --git a/arch/hexagon/kernel/smp.c b/arch/hexagon/kernel/smp.c
index 8e095dffd070..0e364ca43198 100644
--- a/arch/hexagon/kernel/smp.c
+++ b/arch/hexagon/kernel/smp.c
@@ -184,7 +184,7 @@ void __cpuinit start_secondary(void)
 
         local_irq_enable();
 
-        cpu_idle();
+        cpu_startup_entry(CPUHP_ONLINE);
 }