From 8ed6ff548fe551341da7b6918745635c1ae412f3 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nicolas.pitre@linaro.org>
Date: Wed, 3 Aug 2011 12:00:02 -0400
Subject: [PATCH] --- yaml --- r: 295332 b: refs/heads/master c:
 e5ddf4e352443ba010fd084c9e9271f9d0d10ae5 h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/arm/mach-shark/core.c                | 6 ++++++
 trunk/arch/arm/mach-shark/include/mach/system.h | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index de76357ae489..bb5cb6940284 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12d2b4e5f0c65eaa1d61e4e1bbfb2df41bc6cd9d
+refs/heads/master: e5ddf4e352443ba010fd084c9e9271f9d0d10ae5
diff --git a/trunk/arch/arm/mach-shark/core.c b/trunk/arch/arm/mach-shark/core.c
index a851c254ad6c..6a2a7f2c2557 100644
--- a/trunk/arch/arm/mach-shark/core.c
+++ b/trunk/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/trunk/arch/arm/mach-shark/include/mach/system.h b/trunk/arch/arm/mach-shark/include/mach/system.h
index 1b2f2c5050a8..1ec8d6c383d3 100644
--- a/trunk/arch/arm/mach-shark/include/mach/system.h
+++ b/trunk/arch/arm/mach-shark/include/mach/system.h
@@ -8,6 +8,7 @@
 
 static inline void arch_idle(void)
 {
+	cpu_do_idle();
 }
 
 #endif