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>

diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c
index 1d10c4aa9352d36b9b01e5f2e6452d03563b8f33..a26d6a08ae3f86dd49f3098772c36d481a570c34 100644 (file)
--- 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 4e87b61ca040f9bcce3b73e7520421d0451e69ae..81ed252a0f8aeb4f4811858d0f9d39b76e1cc464 100644 (file)
--- 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();