aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/process.c
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2011-12-19 03:03:58 -0500
committerNicolas Pitre <nico@fluxnic.net>2012-01-20 18:55:19 -0500
commitae940913030386884f259eb4d95ac4d93b57144f (patch)
tree0c3ca352424c7b1b56c9978d2b890b9915eb313a /arch/arm/kernel/process.c
parentdaa14d5e60e040bde290ec904af976fef6292627 (diff)
ARM: substitute arch_idle()
Now that all implementations of arch_idle() are equivalent to cpu_do_idle() we can just use the later directly and stop including mach/system.h. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Acked-and-tested-by: Jamie Iles <jamie@jamieiles.com> Acked-by: Tony Lindgren <tony@atomide.com> Tested-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/kernel/process.c')
-rw-r--r--arch/arm/kernel/process.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index ba9e7ef92bec..008e7ce766a7 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -61,8 +61,6 @@ extern void setup_mm_for_reboot(void);
61 61
62static volatile int hlt_counter; 62static volatile int hlt_counter;
63 63
64#include <mach/system.h>
65
66void disable_hlt(void) 64void disable_hlt(void)
67{ 65{
68 hlt_counter++; 66 hlt_counter++;
@@ -191,7 +189,7 @@ static void default_idle(void)
191 if (arm_pm_idle) 189 if (arm_pm_idle)
192 arm_pm_idle(); 190 arm_pm_idle();
193 else 191 else
194 arch_idle(); 192 cpu_do_idle();
195 local_irq_enable(); 193 local_irq_enable();
196} 194}
197 195