From 07a271e8ff43efce5a84924b62a07da4d1f279e4 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Wed, 3 Aug 2011 07:25:39 -0400 Subject: [PATCH] --- yaml --- r: 295331 b: refs/heads/master c: 12d2b4e5f0c65eaa1d61e4e1bbfb2df41bc6cd9d h: refs/heads/master i: 295329: e3c21cd2b1171c2cf64b95ddf2a9b1f0974fa7b0 295327: 8828596bdaf4992e53f04a51e3f92b88c66b40d8 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-ixp4xx/common.c | 6 ++++++ trunk/arch/arm/mach-ixp4xx/include/mach/system.h | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index bcf14b8845f3..de76357ae489 100644 --- 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 index 3841ab4146ba..a6329a0a8ec4 100644 --- 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 index 140a9bef4466..768ac09d0fd2 100644 --- 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 }