diff --git a/[refs] b/[refs] index f2dbd21a641e..677d52e81040 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 928585536ff5a8f320e60efc60e2b7ef2a5f548d +refs/heads/master: 61a0d49c33c7fd57c14895e5b0760bd02b65ac1f diff --git a/trunk/drivers/idle/intel_idle.c b/trunk/drivers/idle/intel_idle.c index c131d58bcb50..15783d5501a8 100644 --- a/trunk/drivers/idle/intel_idle.c +++ b/trunk/drivers/idle/intel_idle.c @@ -220,9 +220,7 @@ static int intel_idle(struct cpuidle_device *dev, struct cpuidle_state *state) kt_before = ktime_get_real(); stop_critical_timings(); -#ifndef MODULE trace_power_start(POWER_CSTATE, (eax >> 4) + 1, cpu); -#endif if (!need_resched()) { __monitor((void *)¤t_thread_info()->flags, 0, 0); diff --git a/trunk/kernel/trace/power-traces.c b/trunk/kernel/trace/power-traces.c index a22582a06161..0e0497d9fade 100644 --- a/trunk/kernel/trace/power-traces.c +++ b/trunk/kernel/trace/power-traces.c @@ -13,5 +13,5 @@ #define CREATE_TRACE_POINTS #include -EXPORT_TRACEPOINT_SYMBOL_GPL(power_frequency); +EXPORT_TRACEPOINT_SYMBOL_GPL(power_start);