3 files changed, 2 insertions, 23 deletions

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 0339181bf3ac..0821e702d03f 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -18,6 +18,7 @@ config PARISC
         select GENERIC_PCI_IOMAP
         select ARCH_HAVE_NMI_SAFE_CMPXCHG
         select GENERIC_SMP_IDLE_THREAD
+        select GENERIC_IDLE_LOOP
         select GENERIC_STRNCPY_FROM_USER
         select SYSCTL_ARCH_UNALIGN_ALLOW
         select HAVE_MOD_ARCH_SPECIFIC
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c
index d13507246c5d..55f92b614182 100644
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
@@ -59,28 +59,6 @@
 #include <asm/unwind.h>
 #include <asm/sections.h>
 
-/*
- * 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)
-{
-        set_thread_flag(TIF_POLLING_NRFLAG);
-
-        /* endless idle loop with no priority at all */
-        while (1) {
-                rcu_idle_enter();
-                while (!need_resched())
-                        barrier();
-                rcu_idle_exit();
-                schedule_preempt_disabled();
-                check_pgt_cache();
-        }
-}
-
-
 #define COMMAND_GLOBAL  F_EXTEND(0xfffe0030)
 #define CMD_RESET       5       /* reset any module */
 
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c
index 6266730efd61..fd1bb1519c2b 100644
--- a/arch/parisc/kernel/smp.c
+++ b/arch/parisc/kernel/smp.c
@@ -329,7 +329,7 @@ void __init smp_callin(void)
 
         local_irq_enable();  /* Interrupts have been off until now */
 
-        cpu_idle();      /* Wait for timer to schedule some work */
+        cpu_startup_entry(CPUHP_ONLINE);
 
         /* NOTREACHED */
         panic("smp_callin() AAAAaaaaahhhh....\n");