diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2011-01-07 21:40:10 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2011-01-07 21:44:56 +0100 |
| commit | 3a9f987b3141f086de27832514aad9f50a53f754 (patch) | |
| tree | bac7e0819f738261f26d1f9dc584ad7312337c8c /include/trace/define_trace.h | |
| parent | Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| download | linux-3a9f987b3141f086de27832514aad9f50a53f754.tar.xz linux-3a9f987b3141f086de27832514aad9f50a53f754.zip | |
tracing: Include module.h in define_trace.h
While doing some developing, Peter Zijlstra and I have found
that if a CREATE_TRACE_POINTS include is done before module.h
is included, it can break the build.
We have been lucky so far that this has not broke the build
since module.h is included in almost everything.
Reported-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'include/trace/define_trace.h')
| -rw-r--r-- | include/trace/define_trace.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/trace/define_trace.h b/include/trace/define_trace.h index b0b4eb24d592..da39b22636f7 100644 --- a/include/trace/define_trace.h +++ b/include/trace/define_trace.h @@ -21,6 +21,16 @@ #undef CREATE_TRACE_POINTS #include <linux/stringify.h> +/* + * module.h includes tracepoints, and because ftrace.h + * pulls in module.h: + * trace/ftrace.h -> linux/ftrace_event.h -> linux/perf_event.h -> + * linux/ftrace.h -> linux/module.h + * we must include module.h here before we play with any of + * the TRACE_EVENT() macros, otherwise the tracepoints included + * by module.h may break the build. + */ +#include <linux/module.h> #undef TRACE_EVENT #define TRACE_EVENT(name, proto, args, tstruct, assign, print) \ |