diff options
| author | Tero Kristo <tero.kristo@nokia.com> | 2009-03-20 15:21:02 +0200 |
|---|---|---|
| committer | Kevin Hilman <khilman@deeprootsystems.com> | 2009-11-11 14:42:50 -0800 |
| commit | cf22854cee10e16e28b1dde136c37e82b7d503ee (patch) | |
| tree | dfde2fd974b8d15d1a1a5a2c13d57d5fe9dd8e76 | |
| parent | da869621c3cd93d5a8361f243b50e5d48d12bd14 (diff) | |
| download | linux-cf22854cee10e16e28b1dde136c37e82b7d503ee.tar.gz linux-cf22854cee10e16e28b1dde136c37e82b7d503ee.tar.bz2 linux-cf22854cee10e16e28b1dde136c37e82b7d503ee.zip | |
OMAP3: PM: Added resched check into idle calls
Fixes a bug where scheduling is delayed until next wakeup due to race
condition (e.g. interrupt requests scheduling just before omap_sram_idle
is entered.)
Signed-off-by: Tero Kristo <tero.kristo@nokia.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
| -rw-r--r-- | arch/arm/mach-omap2/cpuidle34xx.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c index 1d10c4aa9352..a26d6a08ae3f 100644 --- a/arch/arm/mach-omap2/cpuidle34xx.c +++ b/arch/arm/mach-omap2/cpuidle34xx.c @@ -22,6 +22,7 @@ * published by the Free Software Foundation. */ +#include <linux/sched.h> #include <linux/cpuidle.h> #include <plat/prcm.h> @@ -113,7 +114,7 @@ static int omap3_enter_idle(struct cpuidle_device *dev, pwrdm_set_next_pwrst(mpu_pd, mpu_state); pwrdm_set_next_pwrst(core_pd, core_state); - if (omap_irq_pending()) + if (omap_irq_pending() || need_resched()) goto return_sleep_time; if (cx->type == OMAP3_STATE_C1) { diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 4e87b61ca040..81ed252a0f8a 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -523,7 +523,7 @@ static void omap3_pm_idle(void) if (!omap3_can_sleep()) goto out; - if (omap_irq_pending()) + if (omap_irq_pending() || need_resched()) goto out; omap_sram_idle(); |