target_state = &drv->states[next_state];
 
-       trace_power_start(POWER_CSTATE, next_state, dev->cpu);
-       trace_cpu_idle(next_state, dev->cpu);
+       trace_power_start_rcuidle(POWER_CSTATE, next_state, dev->cpu);
+       trace_cpu_idle_rcuidle(next_state, dev->cpu);
 
        entered_state = target_state->enter(dev, drv, next_state);
 
-       trace_power_end(dev->cpu);
-       trace_cpu_idle(PWR_EVENT_EXIT, dev->cpu);
+       trace_power_end_rcuidle(dev->cpu);
+       trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);
 
        if (entered_state >= 0) {
                /* Update cpuidle counters */