---

yaml --- r: 295332 b: refs/heads/master c: e5ddf4e h: refs/heads/master v: v3
git-mirror · Jan 20, 2012 · 8ed6ff5 · 8ed6ff5
1 parent 07a271e
commit 8ed6ff5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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
@@ -8,6 +8,7 @@
 
 static inline void arch_idle(void)
 {
+	cpu_do_idle();
 }
 
 #endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ @@
     static inline void arch_idle(void)
     {
+    	cpu_do_idle();
     }
     #endif