summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-06-03 23:10:15 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-06-03 23:10:15 +0200
commit97b80e685ffae9a6dc946ab08ed32f1eafda97d7 (patch)
tree96baa368706662230b1aa98b3f83d8425aef46b8 /kernel/power
parent91ab377ba3ab202c40a0da402d6c2f1507a15355 (diff)
parent9051785f6928456db0692b8ca972778b9bf42099 (diff)
downloadlinux-97b80e685ffae9a6dc946ab08ed32f1eafda97d7.tar.bz2
Merge branch 'pm-cpuidle'
* pm-cpuidle: PM / suspend: Always use deepest C-state in the "freeze" sleep state cpuidle / menu: move repeated correction factor check to init cpuidle / menu: Return (-1) if there are no suitable states cpuidle: Combine cpuidle_enabled() with cpuidle_select() ARM: clps711x: Add cpuidle driver
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/suspend.c2
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)