diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-17 11:29:53 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-17 11:29:53 +0100 |
| commit | c4e2b432d5b57e2faaeea048079b31c243079647 (patch) | |
| tree | f4e59abeb522ecb11476fe69d827390050a0ffee /include | |
| parent | a234aa9ecdf47a5461573a21dc0b154278df5ba8 (diff) | |
| parent | 72b623c73685e86b70a51855e1058ebc98a9f6ed (diff) | |
Merge branches 'tracing/hw-branch-tracing' and 'tracing/power-tracer' into tracing/core
Diffstat (limited to 'include')
| -rw-r--r-- | include/trace/power.h | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/include/trace/power.h b/include/trace/power.h index c7cefbcdaea..2c733e58e89 100644 --- a/include/trace/power.h +++ b/include/trace/power.h @@ -2,6 +2,7 @@ #define _TRACE_POWER_H #include <linux/ktime.h> +#include <linux/tracepoint.h> enum { POWER_NONE = 0, @@ -18,18 +19,16 @@ struct power_trace { #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 +DECLARE_TRACE(power_start, + TPPROTO(struct power_trace *it, unsigned int type, unsigned int state), + TPARGS(it, type, state)); + +DECLARE_TRACE(power_mark, + TPPROTO(struct power_trace *it, unsigned int type, unsigned int state), + TPARGS(it, type, state)); + +DECLARE_TRACE(power_end, + TPPROTO(struct power_trace *it), + TPARGS(it)); #endif /* _TRACE_POWER_H */ |