diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-26 03:48:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-26 03:48:44 +0100 |
| commit | f4abfb8d0da70e436013e5799338357e1e6a0832 (patch) | |
| tree | 55f087b8e29f64694de84afa09563ad2c0acdd42 /kernel | |
| parent | e36b1e136aa8f8c42fa6b96848c9c6bcaf2c269c (diff) | |
| parent | 3cdfdf91fcc77cfc82592e2b5c2ab35abe819c41 (diff) | |
| download | linux-f4abfb8d0da70e436013e5799338357e1e6a0832.tar.gz linux-f4abfb8d0da70e436013e5799338357e1e6a0832.tar.bz2 linux-f4abfb8d0da70e436013e5799338357e1e6a0832.zip | |
Merge branch 'tip/tracing/ftrace' of ssh://master.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace_events.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace_events.h b/kernel/trace/trace_events.h index cb8455b3ac9a..deb95e5006c8 100644 --- a/kernel/trace/trace_events.h +++ b/kernel/trace/trace_events.h @@ -17,8 +17,8 @@ struct ftrace_event_call { #undef TPFMT #define TPFMT(fmt, args...) fmt "\n", ##args -#undef DEFINE_TRACE_FMT -#define DEFINE_TRACE_FMT(call, proto, args, fmt) \ +#undef TRACE_FORMAT +#define TRACE_FORMAT(call, proto, args, fmt) \ static void ftrace_event_##call(proto) \ { \ event_trace_printk(_RET_IP_, "(" #call ") " fmt); \ |