diff options
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r-- | arch/powerpc/kernel/idle.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/powerpc/kernel/idle.c b/arch/powerpc/kernel/idle.c index 7c66ce13da89..0a48bf5db6c8 100644 --- a/arch/powerpc/kernel/idle.c +++ b/arch/powerpc/kernel/idle.c | |||
@@ -50,12 +50,6 @@ static int __init powersave_off(char *arg) | |||
50 | } | 50 | } |
51 | __setup("powersave=off", powersave_off); | 51 | __setup("powersave=off", powersave_off); |
52 | 52 | ||
53 | #if defined(CONFIG_PPC_PSERIES) && defined(CONFIG_TRACEPOINTS) | ||
54 | static const bool idle_uses_rcu = 1; | ||
55 | #else | ||
56 | static const bool idle_uses_rcu; | ||
57 | #endif | ||
58 | |||
59 | /* | 53 | /* |
60 | * The body of the idle task. | 54 | * The body of the idle task. |
61 | */ | 55 | */ |
@@ -67,8 +61,7 @@ void cpu_idle(void) | |||
67 | set_thread_flag(TIF_POLLING_NRFLAG); | 61 | set_thread_flag(TIF_POLLING_NRFLAG); |
68 | while (1) { | 62 | while (1) { |
69 | tick_nohz_idle_enter(); | 63 | tick_nohz_idle_enter(); |
70 | if (!idle_uses_rcu) | 64 | rcu_idle_enter(); |
71 | rcu_idle_enter(); | ||
72 | 65 | ||
73 | while (!need_resched() && !cpu_should_die()) { | 66 | while (!need_resched() && !cpu_should_die()) { |
74 | ppc64_runlatch_off(); | 67 | ppc64_runlatch_off(); |
@@ -106,8 +99,7 @@ void cpu_idle(void) | |||
106 | 99 | ||
107 | HMT_medium(); | 100 | HMT_medium(); |
108 | ppc64_runlatch_on(); | 101 | ppc64_runlatch_on(); |
109 | if (!idle_uses_rcu) | 102 | rcu_idle_exit(); |
110 | rcu_idle_exit(); | ||
111 | tick_nohz_idle_exit(); | 103 | tick_nohz_idle_exit(); |
112 | preempt_enable_no_resched(); | 104 | preempt_enable_no_resched(); |
113 | if (cpu_should_die()) | 105 | if (cpu_should_die()) |