---

yaml --- r: 223967 b: refs/heads/master c: 61a0d49 h: refs/heads/master i: 223965: 1057a18 223963: e0f72d7 223959: 4ee6502 223951: e540220 223935: 739b857 v: v3
git-mirror · Jan 4, 2011 · 32f3822 · 32f3822
1 parent 46fabfc
commit 32f3822
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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 *)&current_thread_info()->flags, 0, 0);

diff --git a/trunk/kernel/trace/power-traces.c b/trunk/kernel/trace/power-traces.c
@@ -13,5 +13,5 @@
 #define CREATE_TRACE_POINTS
 #include <trace/events/power.h>
 
-EXPORT_TRACEPOINT_SYMBOL_GPL(power_frequency);
+EXPORT_TRACEPOINT_SYMBOL_GPL(power_start);