Some patches for cleanup... compile tested only... Should not break existing user space apps, but they should get converted asap to use power_swtich_state... --- power-trace: Rename power frequency to power_switch_state this interface/function is not intended for frequency changes only, but should get used for any P- (processor frequency), C- (processor sleep), T- (processor throttling), or S- (machine sleep) state. Since it's used in cpufreq.c which must be compiled in and not in acpi-cpufreq.c anymore there is no need to export it for modules. Signed-off-by: Thomas Renninger <trenn@xxxxxxx> --- drivers/cpufreq/cpufreq.c | 1 + include/trace/events/power.h | 7 +++++++ kernel/trace/power-traces.c | 1 - 3 files changed, 8 insertions(+), 1 deletion(-) Index: linux-2.6.35-master/drivers/cpufreq/cpufreq.c =================================================================== --- linux-2.6.35-master.orig/drivers/cpufreq/cpufreq.c +++ linux-2.6.35-master/drivers/cpufreq/cpufreq.c @@ -354,6 +354,7 @@ void cpufreq_notify_transition(struct cp adjust_jiffies(CPUFREQ_POSTCHANGE, freqs); dprintk("FREQ: %lu - CPU: %lu", (unsigned long)freqs->new, (unsigned long)freqs->cpu); + trace_power_switch_state(POWER_PSTATE, freqs->new, freqs->cpu); trace_power_frequency(POWER_PSTATE, freqs->new, freqs->cpu); srcu_notifier_call_chain(&cpufreq_transition_notifier_list, CPUFREQ_POSTCHANGE, freqs); Index: linux-2.6.35-master/include/trace/events/power.h =================================================================== --- linux-2.6.35-master.orig/include/trace/events/power.h +++ linux-2.6.35-master/include/trace/events/power.h @@ -38,6 +38,13 @@ DECLARE_EVENT_CLASS(power, (unsigned long)__entry->state, (unsigned long)__entry->cpu_id) ); +DEFINE_EVENT(power, power_switch_state, + + TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id), + + TP_ARGS(type, state, cpu_id) +); + DEFINE_EVENT(power, power_start, TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id), Index: linux-2.6.35-master/kernel/trace/power-traces.c =================================================================== --- linux-2.6.35-master.orig/kernel/trace/power-traces.c +++ linux-2.6.35-master/kernel/trace/power-traces.c @@ -13,5 +13,4 @@ #define CREATE_TRACE_POINTS #include <trace/events/power.h> -EXPORT_TRACEPOINT_SYMBOL_GPL(power_frequency); -- To unsubscribe from this list: send the line "unsubscribe linux-trace-users" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html