diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-19 00:02:53 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-19 00:02:53 +0200 |
| commit | 3db0bc97678d7de32f25514b290a0ca028dd4512 (patch) | |
| tree | 45729aa3a8cecff0e4d4c1d27c2459109ae5a749 /drivers/base | |
| parent | PM: Rename CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND (diff) | |
| parent | cpuilde / ACPI: remove time from acpi_processor_cx structure (diff) | |
| download | linux-3db0bc97678d7de32f25514b290a0ca028dd4512.tar.xz linux-3db0bc97678d7de32f25514b290a0ca028dd4512.zip | |
Merge branch 'pm-cpuidle'
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/power/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 9cb845e49334..63048f79de5f 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -28,7 +28,7 @@ #include <linux/sched.h> #include <linux/async.h> #include <linux/suspend.h> - +#include <linux/cpuidle.h> #include "../base.h" #include "power.h" @@ -467,6 +467,7 @@ static void dpm_resume_noirq(pm_message_t state) mutex_unlock(&dpm_list_mtx); dpm_show_time(starttime, state, "noirq"); resume_device_irqs(); + cpuidle_resume(); } /** @@ -867,6 +868,7 @@ static int dpm_suspend_noirq(pm_message_t state) ktime_t starttime = ktime_get(); int error = 0; + cpuidle_pause(); suspend_device_irqs(); mutex_lock(&dpm_list_mtx); while (!list_empty(&dpm_late_early_list)) { |