diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-02 02:28:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-02 02:28:08 -0400 |
| commit | 9fc3af467d0749989518a23f7289a6f44e5cb214 (patch) | |
| tree | d9d7e6be11a12fac94a00175c95b246744bb4f6d /include | |
| parent | d65a458b348cd458413b3cfec66e43ebd0367646 (diff) | |
| parent | cc05152ab72d7a65e6ea97d286af4f878c8f7371 (diff) | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
Diffstat (limited to 'include')
| -rw-r--r-- | include/trace/ftrace.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index fb783d94fc54..a9377c0083ad 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h | |||
| @@ -75,15 +75,12 @@ | |||
| 75 | #define DEFINE_EVENT_PRINT(template, name, proto, args, print) \ | 75 | #define DEFINE_EVENT_PRINT(template, name, proto, args, print) \ |
| 76 | DEFINE_EVENT(template, name, PARAMS(proto), PARAMS(args)) | 76 | DEFINE_EVENT(template, name, PARAMS(proto), PARAMS(args)) |
| 77 | 77 | ||
| 78 | #undef __cpparg | ||
| 79 | #define __cpparg(arg...) arg | ||
| 80 | |||
| 81 | /* Callbacks are meaningless to ftrace. */ | 78 | /* Callbacks are meaningless to ftrace. */ |
| 82 | #undef TRACE_EVENT_FN | 79 | #undef TRACE_EVENT_FN |
| 83 | #define TRACE_EVENT_FN(name, proto, args, tstruct, \ | 80 | #define TRACE_EVENT_FN(name, proto, args, tstruct, \ |
| 84 | assign, print, reg, unreg) \ | 81 | assign, print, reg, unreg) \ |
| 85 | TRACE_EVENT(name, __cpparg(proto), __cpparg(args), \ | 82 | TRACE_EVENT(name, PARAMS(proto), PARAMS(args), \ |
| 86 | __cpparg(tstruct), __cpparg(assign), __cpparg(print)) \ | 83 | PARAMS(tstruct), PARAMS(assign), PARAMS(print)) \ |
| 87 | 84 | ||
| 88 | #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) | 85 | #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) |
| 89 | 86 | ||