2 files changed, 2 insertions, 4 deletions

diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index cb7019977c50..ee9df5e3f5eb 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -119,11 +119,13 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv,
         ktime_t time_start, time_end;
         s64 diff;
 
+        trace_cpu_idle_rcuidle(index, dev->cpu);
         time_start = ktime_get();
 
         entered_state = target_state->enter(dev, drv, index);
 
         time_end = ktime_get();
+        trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);
 
         if (!cpuidle_state_is_coupled(dev, drv, entered_state))
                 local_irq_enable();
diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c
index cf009fb0bc25..658a58dc30f4 100644
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c
@@ -147,8 +147,6 @@ use_default:
             clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu))
                 goto use_default;
 
-        trace_cpu_idle_rcuidle(next_state, dev->cpu);
-
         /*
          * Enter the idle state previously returned by the governor decision.
          * This function will block until an interrupt occurs and will take
@@ -156,8 +154,6 @@ use_default:
          */
         entered_state = cpuidle_enter(drv, dev, next_state);
 
-        trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);
-
         if (broadcast)
                 clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu);