From: Nicolas Pitre <nicolas.pitre@linaro.org>
Date: Wed, 3 Aug 2011 16:00:02 +0000 (-0400)
Subject: ARM: mach-shark: properly disable CPU idle call
X-Git-Tag: MMI-PSA29.97-13-9~17116^2~11^2~5
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e5ddf4e352443ba010fd084c9e9271f9d0d10ae5;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ARM: mach-shark: properly disable CPU idle call

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
---

diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c
index a851c254ad6c..6a2a7f2c2557 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 1b2f2c5050a8..1ec8d6c383d3 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