diff options
| author |  Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| 2014-05-07 01:50:57 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| 2014-05-07 01:50:57 +0200 |
| commit | aa9abe2c8eddf426c9b89757129b132c484ee223 (patch) | |
| tree | 1950d527609f6236405193495a410526a7eb19ea /kernel/power | |
| parent | PM / hibernate: no kernel_power_off when pm_power_off NULL (diff) | |
| parent | PM / suspend: Always use deepest C-state in the "freeze" sleep state (diff) | |
| download | linux-aa9abe2c8eddf426c9b89757129b132c484ee223.tar.gz linux-aa9abe2c8eddf426c9b89757129b132c484ee223.tar.bz2 linux-aa9abe2c8eddf426c9b89757129b132c484ee223.zip | |
Merge branch 'pm-cpuidle' into pm-sleep
Diffstat (limited to 'kernel/power')
| -rw-r--r-- | kernel/power/suspend.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index 8233cd4047d7..155721f7f909 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -54,9 +54,11 @@ static void freeze_begin(void) static void freeze_enter(void) { + cpuidle_use_deepest_state(true); cpuidle_resume(); wait_event(suspend_freeze_wait_head, suspend_freeze_wake); cpuidle_pause(); + cpuidle_use_deepest_state(false); } void freeze_wake(void) |