Merge branch 'linus' into idle-test

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index dd5f1eafd6f2..a2d5b95a6d64 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -49,7 +49,7 @@ static int __cpuidle_register_device(struct cpuidle_device *dev);
  */
 static void cpuidle_idle_call(void)
 {
-        struct cpuidle_device *dev = __get_cpu_var(cpuidle_devices);
+        struct cpuidle_device *dev = __this_cpu_read(cpuidle_devices);
         struct cpuidle_state *target_state;
         int next_state;
 
@@ -107,6 +107,7 @@ static void cpuidle_idle_call(void)
         if (cpuidle_curr_governor->reflect)
                 cpuidle_curr_governor->reflect(dev);
         trace_power_end(smp_processor_id());
+        trace_cpu_idle(PWR_EVENT_EXIT, smp_processor_id());
 }
 
 /**