---

yaml --- r: 295331 b: refs/heads/master c: 12d2b4e h: refs/heads/master i: 295329: e3c21cd 295327: 8828596 v: v3
git-mirror · Jan 20, 2012 · 07a271e · 07a271e
1 parent dad4b7b
commit 07a271e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86ce0d2e6f131bd0b5b1b8d32149e008d39b5ea1
+refs/heads/master: 12d2b4e5f0c65eaa1d61e4e1bbfb2df41bc6cd9d
diff --git a/trunk/arch/arm/mach-ixp4xx/common.c b/trunk/arch/arm/mach-ixp4xx/common.c
@@ -236,6 +236,12 @@ void __init ixp4xx_init_irq(void)
 {
 	int i = 0;
 
+	/*
+	 * ixp4xx does not implement the XScale PWRMODE register
+	 * so it must not call cpu_do_idle().
+	 */
+	disable_hlt();
+
 	/* Route all sources to IRQ instead of FIQ */
 	*IXP4XX_ICLR = 0x0;
 

diff --git a/trunk/arch/arm/mach-ixp4xx/include/mach/system.h b/trunk/arch/arm/mach-ixp4xx/include/mach/system.h
@@ -10,10 +10,5 @@
  */
 static inline void arch_idle(void)
 {
-	/* ixp4xx does not implement the XScale PWRMODE register,
-	 * so it must not call cpu_do_idle() here.
-	 */
-#if 0
 	cpu_do_idle();
-#endif
 }