diff options
author | Thomas Renninger <trenn@suse.de> | 2011-01-03 11:50:43 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-01-04 02:16:54 -0500 |
commit | 61a0d49c33c7fd57c14895e5b0760bd02b65ac1f (patch) | |
tree | c59416038143b2deadf2a69a3c3c5ea5c54c63ac | |
parent | 928585536ff5a8f320e60efc60e2b7ef2a5f548d (diff) |
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@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Jean Pihet <jean.pihet@newoldbits.com>
Cc: Jean Pihet <j-pihet@ti.com>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: rjw@sisk.pl
LKML-Reference: <1294073445-14812-2-git-send-email-trenn@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
LKML-Reference: <1290072314-31155-2-git-send-email-trenn@suse.de>
-rw-r--r-- | drivers/idle/intel_idle.c | 2 | ||||
-rw-r--r-- | 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 c131d58bcb50..15783d5501a8 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) | |||
220 | kt_before = ktime_get_real(); | 220 | kt_before = ktime_get_real(); |
221 | 221 | ||
222 | stop_critical_timings(); | 222 | stop_critical_timings(); |
223 | #ifndef MODULE | ||
224 | trace_power_start(POWER_CSTATE, (eax >> 4) + 1, cpu); | 223 | trace_power_start(POWER_CSTATE, (eax >> 4) + 1, cpu); |
225 | #endif | ||
226 | if (!need_resched()) { | 224 | if (!need_resched()) { |
227 | 225 | ||
228 | __monitor((void *)¤t_thread_info()->flags, 0, 0); | 226 | __monitor((void *)¤t_thread_info()->flags, 0, 0); |
diff --git a/kernel/trace/power-traces.c b/kernel/trace/power-traces.c index a22582a06161..0e0497d9fade 100644 --- a/kernel/trace/power-traces.c +++ b/kernel/trace/power-traces.c | |||
@@ -13,5 +13,5 @@ | |||
13 | #define CREATE_TRACE_POINTS | 13 | #define CREATE_TRACE_POINTS |
14 | #include <trace/events/power.h> | 14 | #include <trace/events/power.h> |
15 | 15 | ||
16 | EXPORT_TRACEPOINT_SYMBOL_GPL(power_frequency); | 16 | EXPORT_TRACEPOINT_SYMBOL_GPL(power_start); |
17 | 17 | ||