diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-01-15 15:23:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-15 15:23:27 +0100 |
| commit | 7c46d8da09df22361d1d43465c4f1b06cecaf25f (patch) | |
| tree | 44342b27ffea30e3f5ed54f7e7ebc0221f5e6f5f /include/trace | |
| parent | acac03fa15a8684bb60489ed87b5aae5258c0838 (diff) | |
| parent | 7f85803a26f304e698c673838aab06cc6d4d6e59 (diff) | |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/module.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/trace/events/module.h b/include/trace/events/module.h index c7bb2f0482fe..c6bae36547e5 100644 --- a/include/trace/events/module.h +++ b/include/trace/events/module.h @@ -1,5 +1,15 @@ +/* + * Because linux/module.h has tracepoints in the header, and ftrace.h + * eventually includes this file, define_trace.h includes linux/module.h + * But we do not want the module.h to override the TRACE_SYSTEM macro + * variable that define_trace.h is processing, so we only set it + * when module events are being processed, which would happen when + * CREATE_TRACE_POINTS is defined. + */ +#ifdef CREATE_TRACE_POINTS #undef TRACE_SYSTEM #define TRACE_SYSTEM module +#endif #if !defined(_TRACE_MODULE_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_MODULE_H |