summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel
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
parentdaa14d5e60e040bde290ec904af976fef6292627 (diff)
downloadop-kernel-dev-ae940913030386884f259eb4d95ac4d93b57144f.zip
op-kernel-dev-ae940913030386884f259eb4d95ac4d93b57144f.tar.gz
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')
-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 ba9e7ef..008e7ce 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -61,8 +61,6 @@ extern void setup_mm_for_reboot(void);
static volatile int hlt_counter;
-#include <mach/system.h>
-
void disable_hlt(void)
{
hlt_counter++;
@@ -191,7 +189,7 @@ static void default_idle(void)
if (arm_pm_idle)
arm_pm_idle();
else
- arch_idle();
+ cpu_do_idle();
local_irq_enable();
}
OpenPOWER on IntegriCloud