Merge branch 'pm-cpuidle'

1 files changed, 16 insertions, 1 deletions

diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index d90519cec880..efa9a2ca30e7 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -201,6 +201,22 @@ void cpuidle_resume_and_unlock(void)
 
 EXPORT_SYMBOL_GPL(cpuidle_resume_and_unlock);
 
+/* Currently used in suspend/resume path to suspend cpuidle */
+void cpuidle_pause(void)
+{
+        mutex_lock(&cpuidle_lock);
+        cpuidle_uninstall_idle_handler();
+        mutex_unlock(&cpuidle_lock);
+}
+
+/* Currently used in suspend/resume path to resume cpuidle */
+void cpuidle_resume(void)
+{
+        mutex_lock(&cpuidle_lock);
+        cpuidle_install_idle_handler();
+        mutex_unlock(&cpuidle_lock);
+}
+
 /**
  * cpuidle_wrap_enter - performs timekeeping and irqen around enter function
  * @dev: pointer to a valid cpuidle_device object
@@ -265,7 +281,6 @@ static void poll_idle_init(struct cpuidle_driver *drv)
         state->power_usage = -1;
         state->flags = 0;
         state->enter = poll_idle;
-        state->disable = 0;
 }
 #else
 static void poll_idle_init(struct cpuidle_driver *drv) {}