diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-26 06:29:02 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-26 06:29:02 (GMT) |
| commit | 35dce1a99d010f3d738af4ce1b9b77302fdfe69c (patch) | |
| tree | e34a37de965a79a2ae301de4d0557f500111dde6 /include/trace/define_trace.h | |
| parent | 7cb2e3ee2aeec5b83ecadba929a2dc575dd4008f (diff) | |
| parent | 1c569f0264ea629c10bbab471dd0626ce4d3f19f (diff) | |
| download | linux-35dce1a99d010f3d738af4ce1b9b77302fdfe69c.tar.xz | |
Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core
Conflicts:
include/linux/tracepoint.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/trace/define_trace.h')
| -rw-r--r-- | include/trace/define_trace.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/trace/define_trace.h b/include/trace/define_trace.h index cd150b9..a89ed59 100644 --- a/include/trace/define_trace.h +++ b/include/trace/define_trace.h @@ -26,6 +26,11 @@ #define TRACE_EVENT(name, proto, args, tstruct, assign, print) \ DEFINE_TRACE(name) +#undef TRACE_EVENT_FN +#define TRACE_EVENT_FN(name, proto, args, tstruct, \ + assign, print, reg, unreg) \ + DEFINE_TRACE_FN(name, reg, unreg) + #undef DECLARE_TRACE #define DECLARE_TRACE(name, proto, args) \ DEFINE_TRACE(name) |