metag: 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: James Hogan <james.hogan@imgtec.com>
Link: http://lkml.kernel.org/r/20130321215234.606480852@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig
index afc8973d14883ee340ba9531c7c82b1585f9c9cd..3164f6cebe2b86f13126e71da28ff0fa4684852d 100644 (file)
--- a/arch/metag/Kconfig
+++ b/arch/metag/Kconfig
@@ -7,6 +7,7 @@ config METAG
        select EMBEDDED
        select GENERIC_ATOMIC64
        select GENERIC_CLOCKEVENTS
+       select GENERIC_IDLE_LOOP
        select GENERIC_IRQ_SHOW
        select GENERIC_SMP_IDLE_THREAD
        select HAVE_64BIT_ALIGNED_ACCESS

diff --git a/arch/metag/kernel/process.c b/arch/metag/kernel/process.c
index c6efe62e5b76c620bad0ac8d110a2da7edfe2bf5..dc59235445606283ed6e59a809fabfa1e8d33dea 100644 (file)
--- a/arch/metag/kernel/process.c
+++ b/arch/metag/kernel/process.c
@@ -22,6 +22,7 @@
 #include <linux/pm.h>
 #include <linux/syscalls.h>
 #include <linux/uaccess.h>
+#include <linux/smp.h>
 #include <asm/core_reg.h>
 #include <asm/user_gateway.h>
 #include <asm/tcm.h>
@@ -31,7 +32,7 @@
 /*
  * Wait for the next interrupt and enable local interrupts
  */
-static inline void arch_idle(void)
+void arch_cpu_idle(void)
 {
        int tmp;
 
@@ -59,36 +60,12 @@ static inline void arch_idle(void)
                      : "r" (get_trigger_mask()));
 }
 
-void cpu_idle(void)
-{
-       set_thread_flag(TIF_POLLING_NRFLAG);
-
-       while (1) {
-               tick_nohz_idle_enter();
-               rcu_idle_enter();
-
-               while (!need_resched()) {
-                       /*
-                        * We need to disable interrupts here to ensure we don't
-                        * miss a wakeup call.
-                        */
-                       local_irq_disable();
-                       if (!need_resched()) {
 #ifdef CONFIG_HOTPLUG_CPU
-                               if (cpu_is_offline(smp_processor_id()))
-                                       cpu_die();
-#endif
-                               arch_idle();
-                       } else {
-                               local_irq_enable();
-                       }
-               }
-
-               rcu_idle_exit();
-               tick_nohz_idle_exit();
-               schedule_preempt_disabled();
-        }
+void arch_cpu_idle_dead(void)
+{
+       cpu_die();
 }
+#endif
 
 void (*pm_power_off)(void);
 EXPORT_SYMBOL(pm_power_off);

diff --git a/arch/metag/kernel/smp.c b/arch/metag/kernel/smp.c
index 4b6d1f14df32dcdeff8f26eaa550f4b8a5f43e3a..4de8fc8e31a5b330ee39e5397f4dd57217fce025 100644 (file)
--- a/arch/metag/kernel/smp.c
+++ b/arch/metag/kernel/smp.c
@@ -297,7 +297,7 @@ asmlinkage void secondary_start_kernel(void)
        /*
         * OK, it's off to the idle thread for us
         */
-       cpu_idle();
+       cpu_startup_entry(CPUHP_ONLINE);
 }
 
 void __init smp_cpus_done(unsigned int max_cpus)