Skip to content

Commit

Permalink
Revert "tracing: Include module.h in define_trace.h"
Browse files Browse the repository at this point in the history
This reverts commit 3a9f987.

With all the files that are real modules now having module.h
explicitly called out for inclusion, and no reliance on any
implicit presence of module.h assumed, we should no longer
need this workaround.

Signed-off-by: Paul Gortmaker <[email protected]>
  • Loading branch information
Paul Gortmaker committed Oct 31, 2011
1 parent ec53cf2 commit 67b8499
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions include/trace/define_trace.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,6 @@
#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) \
Expand Down

0 comments on commit 67b8499

Please sign in to comment.