2 files changed, 8 insertions, 4 deletions

diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 386888f10df0..e4855c33f897 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -96,7 +96,15 @@ static void cpuidle_idle_call(void)
 
         /* enter the state and update stats */
         dev->last_state = target_state;
+
+        trace_power_start(POWER_CSTATE, next_state, dev->cpu);
+        trace_cpu_idle(next_state, dev->cpu);
+
         dev->last_residency = target_state->enter(dev, target_state);
+
+        trace_power_end(dev->cpu);
+        trace_cpu_idle(PWR_EVENT_EXIT, dev->cpu);
+
         if (dev->last_state)
                 target_state = dev->last_state;
 
@@ -106,8 +114,6 @@ static void cpuidle_idle_call(void)
         /* give the governor an opportunity to reflect on the outcome */
         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());
 }
 
 /**
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 56ac09d6c930..60fa6ecdb41f 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -220,8 +220,6 @@ static int intel_idle(struct cpuidle_device *dev, struct cpuidle_state *state)
         kt_before = ktime_get_real();
 
         stop_critical_timings();
-        trace_power_start(POWER_CSTATE, (eax >> 4) + 1, cpu);
-        trace_cpu_idle((eax >> 4) + 1, cpu);
         if (!need_resched()) {
 
                 __monitor((void *)&current_thread_info()->flags, 0, 0);