Merge branch 'cpuidle-perf-events' into idle-test

[firefly-linux-kernel-4.4.55.git] / drivers / idle / intel_idle.c

diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index d14585b2e045bbc6f088d31fe44f3eda4ed63f07..7acb32e7f8173de556aaa2fa93db2fecae20603a 100644 (file)
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -231,8 +231,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);