Merge 3.15-rc3 into staging-next

1 files changed, 3 insertions, 0 deletions

diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index c3ad9cafe930..8233cd4047d7 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/console.h>
 #include <linux/cpu.h>
+#include <linux/cpuidle.h>
 #include <linux/syscalls.h>
 #include <linux/gfp.h>
 #include <linux/io.h>
@@ -53,7 +54,9 @@ static void freeze_begin(void)
 
 static void freeze_enter(void)
 {
+        cpuidle_resume();
         wait_event(suspend_freeze_wait_head, suspend_freeze_wake);
+        cpuidle_pause();
 }
 
 void freeze_wake(void)