Skip to content

Commit 67b8499

Browse files
author
Paul Gortmaker
committed
Revert "tracing: Include module.h in define_trace.h"
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]>
1 parent ec53cf2 commit 67b8499

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

include/trace/define_trace.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,6 @@
2121
#undef CREATE_TRACE_POINTS
2222

2323
#include <linux/stringify.h>
24-
/*
25-
* module.h includes tracepoints, and because ftrace.h
26-
* pulls in module.h:
27-
* trace/ftrace.h -> linux/ftrace_event.h -> linux/perf_event.h ->
28-
* linux/ftrace.h -> linux/module.h
29-
* we must include module.h here before we play with any of
30-
* the TRACE_EVENT() macros, otherwise the tracepoints included
31-
* by module.h may break the build.
32-
*/
33-
#include <linux/module.h>
3424

3525
#undef TRACE_EVENT
3626
#define TRACE_EVENT(name, proto, args, tstruct, assign, print) \

0 commit comments

Comments
 (0)