diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-28 04:15:58 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-28 04:15:58 -0500 |
| commit | acdb2c287916ce247c09d460266370af45da55c5 (patch) | |
| tree | e09d6f8fa8f2b28d363374d027f9b4af1d3888cb /include/linux | |
| parent | e9abf4c59d75cd71f118764376d037a677f573d0 (diff) | |
| parent | f2034f1e1adaac6713a6d48b5a2d4f3aa3e63ccb (diff) | |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/tracepoint.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h index 62d13391a240..152b2f03fb86 100644 --- a/include/linux/tracepoint.h +++ b/include/linux/tracepoint.h | |||
| @@ -157,4 +157,7 @@ static inline void tracepoint_synchronize_unregister(void) | |||
| 157 | #define TRACE_FORMAT(name, proto, args, fmt) \ | 157 | #define TRACE_FORMAT(name, proto, args, fmt) \ |
| 158 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)) | 158 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)) |
| 159 | 159 | ||
| 160 | #define TRACE_EVENT_FORMAT(name, proto, args, fmt, struct, tpfmt) \ | ||
| 161 | TRACE_FORMAT(name, PARAMS(proto), PARAMS(args), PARAMS(fmt)) | ||
| 162 | |||
| 160 | #endif | 163 | #endif |