[tip:perf/core] perf: Do not export power_frequency, but power_start event

From: tip-bot for Thomas Renninger
Date: Tue Jan 04 2011 - 03:27:02 EST


Commit-ID: 61a0d49c33c7fd57c14895e5b0760bd02b65ac1f
Gitweb: http://git.kernel.org/tip/61a0d49c33c7fd57c14895e5b0760bd02b65ac1f
Author: Thomas Renninger <trenn@xxxxxxx>
AuthorDate: Mon, 3 Jan 2011 17:50:43 +0100
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Tue, 4 Jan 2011 08:16:54 +0100

perf: Do not export power_frequency, but power_start event

power_frequency moved to drivers/cpufreq/cpufreq.c which has
to be compiled in, no need to export it.

intel_idle can a be module though...

Signed-off-by: Thomas Renninger <trenn@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Acked-by: Jean Pihet <jean.pihet@xxxxxxxxxxxxxx>
Cc: Jean Pihet <j-pihet@xxxxxx>
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Cc: rjw@xxxxxxx
LKML-Reference: <1294073445-14812-2-git-send-email-trenn@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
LKML-Reference: <1290072314-31155-2-git-send-email-trenn@xxxxxxx>
---
drivers/idle/intel_idle.c | 2 --
kernel/trace/power-traces.c | 2 +-
2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index c131d58..15783d5 100644
--- a/drivers/idle/intel_idle.c
+++ b/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/kernel/trace/power-traces.c b/kernel/trace/power-traces.c
index a22582a..0e0497d 100644
--- a/kernel/trace/power-traces.c
+++ b/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);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/