From 32f3822db22fd0ae37f299e18226398884c002be Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.de>
Date: Mon, 3 Jan 2011 17:50:43 +0100
Subject: [PATCH] --- yaml --- r: 223967 b: refs/heads/master c:
 61a0d49c33c7fd57c14895e5b0760bd02b65ac1f h: refs/heads/master i:   223965:
 1057a1828e85ffb676b7423b20df721e50df3f2d   223963:
 e0f72d782ea87c356359813cd58e7d134a671a08   223959:
 4ee650261385d6a0d668e0b13d8405862020230c   223951:
 e5402208edad708362f1d0c47610b36a3ee05bd4   223935:
 739b857adf5f1be1b273c247bf4e809265979017 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/idle/intel_idle.c   | 2 --
 trunk/kernel/trace/power-traces.c | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

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 *)&current_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 <trace/events/power.h>
 
-EXPORT_TRACEPOINT_SYMBOL_GPL(power_frequency);
+EXPORT_TRACEPOINT_SYMBOL_GPL(power_start);