summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shark
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2011-08-03 12:00:02 -0400
committerNicolas Pitre <nico@fluxnic.net>2012-01-20 18:55:17 -0500
commite5ddf4e352443ba010fd084c9e9271f9d0d10ae5 (patch)
treec4a1851169185606497107ac126df7ed6516f69d /arch/arm/mach-shark
parent12d2b4e5f0c65eaa1d61e4e1bbfb2df41bc6cd9d (diff)
ARM: mach-shark: properly disable CPU idle call
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Diffstat (limited to 'arch/arm/mach-shark')
-rw-r--r--arch/arm/mach-shark/core.c6
-rw-r--r--arch/arm/mach-shark/include/mach/system.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c
index a851c254ad6..6a2a7f2c255 100644
--- a/arch/arm/mach-shark/core.c
+++ b/arch/arm/mach-shark/core.c
@@ -149,10 +149,16 @@ static struct sys_timer shark_timer = {
.init = shark_timer_init,
};
+static void shark_init_early(void)
+{
+ disable_hlt();
+}
+
MACHINE_START(SHARK, "Shark")
/* Maintainer: Alexander Schulz */
.atag_offset = 0x3000,
.map_io = shark_map_io,
+ .init_early = shark_init_early,
.init_irq = shark_init_irq,
.timer = &shark_timer,
.dma_zone_size = SZ_4M,
diff --git a/arch/arm/mach-shark/include/mach/system.h b/arch/arm/mach-shark/include/mach/system.h
index 1b2f2c5050a..1ec8d6c383d 100644
--- a/arch/arm/mach-shark/include/mach/system.h
+++ b/arch/arm/mach-shark/include/mach/system.h
@@ -8,6 +8,7 @@
static inline void arch_idle(void)
{
+ cpu_do_idle();
}
#endif