Merge branch 'cpuidle' into test

This commit is contained in:
Len Brown 2008-10-22 23:20:05 -04:00
commit 4538fad56e
3 changed files with 12 additions and 1 deletions

View file

@ -1587,6 +1587,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
if (acpi_idle_bm_check()) {
if (dev->safe_state) {
dev->last_state = dev->safe_state;
return dev->safe_state->enter(dev, dev->safe_state);
} else {
local_irq_disable();