mips: Use generic idle loop

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Paul McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Reviewed-by: Cc: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Cc: Magnus Damm <magnus.damm@gmail.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Link: http://lkml.kernel.org/r/20130321215234.754954871@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 51244bf972718a54876e7ba2ab78ae1790c98e59..e1a3d02af637b87d8b85e2482b1932c294ad6928 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -34,6 +34,7 @@ config MIPS
        select HAVE_MEMBLOCK_NODE_MAP
        select ARCH_DISCARD_MEMBLOCK
        select GENERIC_SMP_IDLE_THREAD
+       select GENERIC_IDLE_LOOP
        select BUILDTIME_EXTABLE_SORT
        select GENERIC_CLOCKEVENTS
        select GENERIC_CMOS_UPDATE

diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index 3be4405c2d14570bdc04f52206f1cefa278c92a0..cfc742d75b7f3a74f1ace85269d55e0e0b85a48d 100644 (file)
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -41,44 +41,26 @@
 #include <asm/inst.h>
 #include <asm/stacktrace.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 __noreturn cpu_idle(void)
+#ifdef CONFIG_HOTPLUG_CPU
+void arch_cpu_idle_dead(void)
 {
-       int cpu;
-
-       /* CPU is going idle. */
-       cpu = smp_processor_id();
+       /* What the heck is this check doing ? */
+       if (!cpu_isset(smp_processor_id(), cpu_callin_map))
+               play_dead();
+}
+#endif
 
-       /* endless idle loop with no priority at all */
-       while (1) {
-               tick_nohz_idle_enter();
-               rcu_idle_enter();
-               while (!need_resched() && cpu_online(cpu)) {
+void arch_cpu_idle(void)
+{
 #ifdef CONFIG_MIPS_MT_SMTC
-                       extern void smtc_idle_loop_hook(void);
+       extern void smtc_idle_loop_hook(void);
 
-                       smtc_idle_loop_hook();
+       smtc_idle_loop_hook();
 #endif
-
-                       if (cpu_wait) {
-                               /* Don't trace irqs off for idle */
-                               stop_critical_timings();
-                               (*cpu_wait)();
-                               start_critical_timings();
-                       }
-               }
-#ifdef CONFIG_HOTPLUG_CPU
-               if (!cpu_online(cpu) && !cpu_isset(cpu, cpu_callin_map))
-                       play_dead();
-#endif
-               rcu_idle_exit();
-               tick_nohz_idle_exit();
-               schedule_preempt_disabled();
-       }
+       if (cpu_wait)
+               (*cpu_wait)();
+       else
+               local_irq_enable();
 }
 
 asmlinkage void ret_from_fork(void);

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