diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2013-03-21 17:49:50 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2013-04-08 11:39:26 -0400 |
commit | d1dba0fcd3e62f32d5925bcb91eba8757951464c (patch) | |
tree | e88e2dfcf1f2fd1f23727192b8ac2cc46a5643ac /arch/metag | |
parent | dfa174dcf841d0665065dedec2bc133227da56ef (diff) |
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>
Diffstat (limited to 'arch/metag')
-rw-r--r-- | arch/metag/Kconfig | 1 | ||||
-rw-r--r-- | arch/metag/kernel/process.c | 35 | ||||
-rw-r--r-- | arch/metag/kernel/smp.c | 2 |
3 files changed, 8 insertions, 30 deletions
diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig index afc8973d1488..3164f6cebe2b 100644 --- a/arch/metag/Kconfig +++ b/arch/metag/Kconfig | |||
@@ -7,6 +7,7 @@ config METAG | |||
7 | select EMBEDDED | 7 | select EMBEDDED |
8 | select GENERIC_ATOMIC64 | 8 | select GENERIC_ATOMIC64 |
9 | select GENERIC_CLOCKEVENTS | 9 | select GENERIC_CLOCKEVENTS |
10 | select GENERIC_IDLE_LOOP | ||
10 | select GENERIC_IRQ_SHOW | 11 | select GENERIC_IRQ_SHOW |
11 | select GENERIC_SMP_IDLE_THREAD | 12 | select GENERIC_SMP_IDLE_THREAD |
12 | select HAVE_64BIT_ALIGNED_ACCESS | 13 | select HAVE_64BIT_ALIGNED_ACCESS |
diff --git a/arch/metag/kernel/process.c b/arch/metag/kernel/process.c index c6efe62e5b76..dc5923544560 100644 --- a/arch/metag/kernel/process.c +++ b/arch/metag/kernel/process.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <linux/pm.h> | 22 | #include <linux/pm.h> |
23 | #include <linux/syscalls.h> | 23 | #include <linux/syscalls.h> |
24 | #include <linux/uaccess.h> | 24 | #include <linux/uaccess.h> |
25 | #include <linux/smp.h> | ||
25 | #include <asm/core_reg.h> | 26 | #include <asm/core_reg.h> |
26 | #include <asm/user_gateway.h> | 27 | #include <asm/user_gateway.h> |
27 | #include <asm/tcm.h> | 28 | #include <asm/tcm.h> |
@@ -31,7 +32,7 @@ | |||
31 | /* | 32 | /* |
32 | * Wait for the next interrupt and enable local interrupts | 33 | * Wait for the next interrupt and enable local interrupts |
33 | */ | 34 | */ |
34 | static inline void arch_idle(void) | 35 | void arch_cpu_idle(void) |
35 | { | 36 | { |
36 | int tmp; | 37 | int tmp; |
37 | 38 | ||
@@ -59,36 +60,12 @@ static inline void arch_idle(void) | |||
59 | : "r" (get_trigger_mask())); | 60 | : "r" (get_trigger_mask())); |
60 | } | 61 | } |
61 | 62 | ||
62 | void cpu_idle(void) | ||
63 | { | ||
64 | set_thread_flag(TIF_POLLING_NRFLAG); | ||
65 | |||
66 | while (1) { | ||
67 | tick_nohz_idle_enter(); | ||
68 | rcu_idle_enter(); | ||
69 | |||
70 | while (!need_resched()) { | ||
71 | /* | ||
72 | * We need to disable interrupts here to ensure we don't | ||
73 | * miss a wakeup call. | ||
74 | */ | ||
75 | local_irq_disable(); | ||
76 | if (!need_resched()) { | ||
77 | #ifdef CONFIG_HOTPLUG_CPU | 63 | #ifdef CONFIG_HOTPLUG_CPU |
78 | if (cpu_is_offline(smp_processor_id())) | 64 | void arch_cpu_idle_dead(void) |
79 | cpu_die(); | 65 | { |
80 | #endif | 66 | cpu_die(); |
81 | arch_idle(); | ||
82 | } else { | ||
83 | local_irq_enable(); | ||
84 | } | ||
85 | } | ||
86 | |||
87 | rcu_idle_exit(); | ||
88 | tick_nohz_idle_exit(); | ||
89 | schedule_preempt_disabled(); | ||
90 | } | ||
91 | } | 67 | } |
68 | #endif | ||
92 | 69 | ||
93 | void (*pm_power_off)(void); | 70 | void (*pm_power_off)(void); |
94 | EXPORT_SYMBOL(pm_power_off); | 71 | EXPORT_SYMBOL(pm_power_off); |
diff --git a/arch/metag/kernel/smp.c b/arch/metag/kernel/smp.c index 4b6d1f14df32..4de8fc8e31a5 100644 --- a/arch/metag/kernel/smp.c +++ b/arch/metag/kernel/smp.c | |||
@@ -297,7 +297,7 @@ asmlinkage void secondary_start_kernel(void) | |||
297 | /* | 297 | /* |
298 | * OK, it's off to the idle thread for us | 298 | * OK, it's off to the idle thread for us |
299 | */ | 299 | */ |
300 | cpu_idle(); | 300 | cpu_startup_entry(CPUHP_ONLINE); |
301 | } | 301 | } |
302 | 302 | ||
303 | void __init smp_cpus_done(unsigned int max_cpus) | 303 | void __init smp_cpus_done(unsigned int max_cpus) |