Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / cpuidle / cpuidle.c

diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 3e146b2ada4a1c4682ecaa5aca1394f15c2c3238..87411cebc57725223a994eb6467ad0aa209d3515 100644 (file)
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -137,13 +137,13 @@ int cpuidle_idle_call(void)
                return 0;
        }
 
-       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 = cpuidle_enter_ops(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 */