DO NOT APPLY THIS ONE!!! The others should go into a mainline tree if Jean is ok with them. This one does not work, due to some include dependencies or whatever else I can't see right now. The idea: Provide old trace power interfaces via .config option to not break existing perf/powertop/.. binaries. Not sure whether it's worth looking at it further. It shouldn't be needed... Thomas --- include/trace/events/power.h | 11 +++++++++++ kernel/trace/Kconfig | 4 ++++ 2 files changed, 15 insertions(+) Index: linux-2.6.35-master/kernel/trace/Kconfig =================================================================== --- linux-2.6.35-master.orig/kernel/trace/Kconfig +++ linux-2.6.35-master/kernel/trace/Kconfig @@ -64,6 +64,10 @@ config EVENT_TRACING select CONTEXT_SWITCH_TRACER bool +config DEPRECATED_POWER_EVENT_TRACING + bool + default n + config CONTEXT_SWITCH_TRACER bool 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 @@ -50,6 +50,7 @@ DEFINE_EVENT(power, power_switch_state, TP_ARGS(type, state, cpu_id) ); +#ifdef CONFIG_DEPRECATED_POWER_EVENT_TRACING DEFINE_EVENT(power, power_start, TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id), @@ -81,6 +82,16 @@ TRACE_EVENT(power_end, TP_printk("cpu_id=%lu", (unsigned long)__entry->cpu_id) ); +#else +inline void trace_power_end(unsigned int cpu_id) +{} +inline void trace_power_start(unsigned int type, unsigned int state, + unsigned int cpu_id) +{} +inline void trace_power_frequency(unsigned int type, unsigned int state, + unsigned int cpu_id) +{} +#endif /* * The clock events are used for clock enable/disable and for -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html