diff options
Diffstat (limited to 'arch/arm/kernel/process.c')
-rw-r--r-- | arch/arm/kernel/process.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 92f7b15dd221..adabeababeb0 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <linux/uaccess.h> | 30 | #include <linux/uaccess.h> |
31 | #include <linux/random.h> | 31 | #include <linux/random.h> |
32 | #include <linux/hw_breakpoint.h> | 32 | #include <linux/hw_breakpoint.h> |
33 | #include <linux/cpuidle.h> | ||
34 | #include <linux/leds.h> | 33 | #include <linux/leds.h> |
35 | #include <linux/reboot.h> | 34 | #include <linux/reboot.h> |
36 | 35 | ||
@@ -133,7 +132,11 @@ EXPORT_SYMBOL_GPL(arm_pm_restart); | |||
133 | 132 | ||
134 | void (*arm_pm_idle)(void); | 133 | void (*arm_pm_idle)(void); |
135 | 134 | ||
136 | static void default_idle(void) | 135 | /* |
136 | * Called from the core idle loop. | ||
137 | */ | ||
138 | |||
139 | void arch_cpu_idle(void) | ||
137 | { | 140 | { |
138 | if (arm_pm_idle) | 141 | if (arm_pm_idle) |
139 | arm_pm_idle(); | 142 | arm_pm_idle(); |
@@ -168,15 +171,6 @@ void arch_cpu_idle_dead(void) | |||
168 | #endif | 171 | #endif |
169 | 172 | ||
170 | /* | 173 | /* |
171 | * Called from the core idle loop. | ||
172 | */ | ||
173 | void arch_cpu_idle(void) | ||
174 | { | ||
175 | if (cpuidle_idle_call()) | ||
176 | default_idle(); | ||
177 | } | ||
178 | |||
179 | /* | ||
180 | * Called by kexec, immediately prior to machine_kexec(). | 174 | * Called by kexec, immediately prior to machine_kexec(). |
181 | * | 175 | * |
182 | * This must completely disable all secondary CPUs; simply causing those CPUs | 176 | * This must completely disable all secondary CPUs; simply causing those CPUs |