Skip to content

Commit

Permalink
OMAP3: PM: Added resched check into idle calls
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tero Kristo authored and Kevin Hilman committed Nov 11, 2009
1 parent da86962 commit cf22854
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion arch/arm/mach-omap2/cpuidle34xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
* published by the Free Software Foundation.
*/

#include <linux/sched.h>
#include <linux/cpuidle.h>

#include <plat/prcm.h>
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-omap2/pm34xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit cf22854

Please sign in to comment.