diff options
Diffstat (limited to 'arch/sh/kernel')
-rw-r--r-- | arch/sh/kernel/idle.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/sh/kernel/idle.c b/arch/sh/kernel/idle.c index 0c910163caa3..3d5a1b387cc0 100644 --- a/arch/sh/kernel/idle.c +++ b/arch/sh/kernel/idle.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <asm/smp.h> | 22 | #include <asm/smp.h> |
23 | #include <asm/bl_bit.h> | 23 | #include <asm/bl_bit.h> |
24 | 24 | ||
25 | void (*pm_idle)(void); | 25 | static void (*sh_idle)(void); |
26 | 26 | ||
27 | static int hlt_counter; | 27 | static int hlt_counter; |
28 | 28 | ||
@@ -103,9 +103,9 @@ void cpu_idle(void) | |||
103 | /* Don't trace irqs off for idle */ | 103 | /* Don't trace irqs off for idle */ |
104 | stop_critical_timings(); | 104 | stop_critical_timings(); |
105 | if (cpuidle_idle_call()) | 105 | if (cpuidle_idle_call()) |
106 | pm_idle(); | 106 | sh_idle(); |
107 | /* | 107 | /* |
108 | * Sanity check to ensure that pm_idle() returns | 108 | * Sanity check to ensure that sh_idle() returns |
109 | * with IRQs enabled | 109 | * with IRQs enabled |
110 | */ | 110 | */ |
111 | WARN_ON(irqs_disabled()); | 111 | WARN_ON(irqs_disabled()); |
@@ -123,13 +123,13 @@ void __init select_idle_routine(void) | |||
123 | /* | 123 | /* |
124 | * If a platform has set its own idle routine, leave it alone. | 124 | * If a platform has set its own idle routine, leave it alone. |
125 | */ | 125 | */ |
126 | if (pm_idle) | 126 | if (sh_idle) |
127 | return; | 127 | return; |
128 | 128 | ||
129 | if (hlt_works()) | 129 | if (hlt_works()) |
130 | pm_idle = default_idle; | 130 | sh_idle = default_idle; |
131 | else | 131 | else |
132 | pm_idle = poll_idle; | 132 | sh_idle = poll_idle; |
133 | } | 133 | } |
134 | 134 | ||
135 | void stop_this_cpu(void *unused) | 135 | void stop_this_cpu(void *unused) |