tracing: Include module.h in define_trace.h (3a9f987b) · Commits · 戴 / test

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>

include/trace/define_trace.h

+10 −0

Original line number	Diff line number	Diff line
		@@ -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) \

Admin message