tracing/power: move the power trace headers to a dedicated file
PATCH 3/5 tracing/power: move the power trace headers to a dedicated file
Impact: cleanup
Move the power tracer headers to trace/power.h to keep ftrace.h and power bits more easy to maintain as separated topics.
Cc Arjan van de Ven <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
Signed-off-by Frederic Weisbecker <[email protected]>
--- arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 2 +- arch/x86/kernel/process.c | 2 +- include/linux/ftrace.h | 30 ------------------------ include/trace/power.h | 35 ++++++++++++++++++++++++++++ kernel/trace/trace.h | 1 + kernel/trace/trace_power.c | 2 +- 6 files changed, 39 insertions(+), 33 deletions(-) create mode 100644 include/trace/power.h
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +1 -1
@@ -33,7 +33,7 @@#include <linux/cpufreq.h> #include <linux/compiler.h> #include <linux/dmi.h> -#include <linux/ftrace.h> +#include <trace/power.h> #include <linux/acpi.h> #include <acpi/processor.h>
arch/x86/kernel/process.c +1 -1
@@ -8,7 +8,7 @@#include <linux/module.h> #include <linux/pm.h> #include <linux/clockchips.h> -#include <linux/ftrace.h> +#include <trace/power.h> #include <asm/system.h> #include <asm/apic.h>
include/linux/ftrace.h +0 -30
@@ -339,36 +339,6 @@ ftrace_init_module(struct module *mod, unsigned long *start, unsigned long *end) { }#endif -enum { -POWER_NONE =0 , -POWER_CSTATE =1 , -POWER_PSTATE =2 , -}; - -struct power_trace { -#ifdef CONFIG_POWER_TRACER -ktime_t stamp; -ktime_t end; -int type; -int state; -#endif -}; - -#ifdef CONFIG_POWER_TRACER -extern void trace_power_start (struct power_trace *it,unsigned int type, -unsigned int state); -extern void trace_power_mark (struct power_trace *it,unsigned int type, -unsigned int state); -extern void trace_power_end (struct power_trace *it); -#else -static inline void trace_power_start (struct power_trace *it,unsigned int type, -unsigned int state) { } -static inline void trace_power_mark (struct power_trace *it,unsigned int type, -unsigned int state) { } -static inline void trace_power_end (struct power_trace *it) { } -#endif - -/* * Structure that defines an entry function trace. */
include/trace/power.h new file +35 -0
@@ -0,0 +1,35 @@ +#ifndef _TRACE_POWER_H +#define _TRACE_POWER_H + +#include <linux/ktime.h> + +enum { +POWER_NONE =0 , +POWER_CSTATE =1 , +POWER_PSTATE =2 , +}; + +struct power_trace { +#ifdef CONFIG_POWER_TRACER +ktime_t stamp; +ktime_t end; +int type; +int state; +#endif +}; + +#ifdef CONFIG_POWER_TRACER +extern void trace_power_start (struct power_trace *it,unsigned int type, +unsigned int state); +extern void trace_power_mark (struct power_trace *it,unsigned int type, +unsigned int state); +extern void trace_power_end (struct power_trace *it); +#else +static inline void trace_power_start (struct power_trace *it,unsigned int type, +unsigned int state) { } +static inline void trace_power_mark (struct power_trace *it,unsigned int type, +unsigned int state) { } +static inline void trace_power_end (struct power_trace *it) { } +#endif + +#endif /* _TRACE_POWER_H */
kernel/trace/trace.h +1 -0
@@ -10,6 +10,7 @@#include <linux/ftrace.h> #include <trace/boot.h> #include <trace/kmemtrace.h> +#include <trace/power.h> enum trace_type { __TRACE_FIRST_TYPE =0 ,
kernel/trace/trace_power.c +1 -1
@@ -11,7 +11,7 @@#include <linux/init.h> #include <linux/debugfs.h> -#include <linux/ftrace.h> +#include <trace/power.h> #include <linux/kallsyms.h> #include <linux/module.h>
Signature · 1 line
1.6.1
Ingo Molnar
AppliedQuoted 8 lines · Frederic Weisbecker
Impact: cleanup
Move the power tracer headers to
trace/power.hto keepftrace.hand power bits more easy to maintain as separated topics.Cc Arjan van de Ven <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Signed-off-by Frederic Weisbecker <[email protected]>
Quoted 9 lines
--- arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 2 +- arch/x86/kernel/process.c | 2 +- include/linux/ftrace.h | 30 ------------------------ include/trace/power.h | 35 ++++++++++++++++++++++++++++ kernel/trace/trace.h | 1 + kernel/trace/trace_power.c | 2 +- 6 files changed, 39 insertions(+), 33 deletions(-) create mode 100644 include/trace/power.h
Applied to tip/tracing/ftrace, thanks Frederic!
Ingo