diff options
| author | Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> | 2010-06-14 15:14:43 +0200 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2010-09-02 22:45:35 -0600 |
| commit | 7df9c36efd4acb8b2965ba8b7f0305ffabb13a2f (patch) | |
| tree | b8f8c819244737ed33aaaf2d17dc38364fd6da31 | |
| parent | 3f5c2c0f90cf01ca62d094d021ae6b9d114218b5 (diff) | |
fix WARN_ON() in cpu_idle() for v2.6.34
Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Change-Id: I6d1e4a5e33153184448a49f951368030a07b288c
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2411
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
| -rwxr-xr-x | arch/arm/mach-ux500/cpuidle.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/cpuidle.c b/arch/arm/mach-ux500/cpuidle.c index 58a031ee93a..447d10a1e18 100755 --- a/arch/arm/mach-ux500/cpuidle.c +++ b/arch/arm/mach-ux500/cpuidle.c @@ -161,6 +161,8 @@ static int u8500_enter_idle(struct cpuidle_device *dev, int ret = 0; cstate = cpuidle_get_statedata(state); + local_irq_disable(); + if (cstate->type == U8500_CSTATE_C1) ret = wfi_idle(dev, state); @@ -170,6 +172,8 @@ static int u8500_enter_idle(struct cpuidle_device *dev, if (cstate->type == U8500_CSTATE_C0) ret = poll_idle(dev, state); + local_irq_enable(); + return ret; } |