summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2011-09-18 21:36:07 +0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-11-01 03:32:35 +0400
commit67b84999b1a8b1af5625b1eabe92146c5eb42932 (patch)
tree5e746daf684ba699b02a489c75a8d501dddbc6b0
parentec53cf23c0ddb0c29950b9a4ac46964c4c6c6c2f (diff)
downloadlinux-67b84999b1a8b1af5625b1eabe92146c5eb42932.tar.xz
Revert "tracing: Include module.h in define_trace.h"
This reverts commit 3a9f987b3141f086de27832514aad9f50a53f754. 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 <paul.gortmaker@windriver.com>
-rw-r--r--include/trace/define_trace.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/include/trace/define_trace.h b/include/trace/define_trace.h
index da39b22636f7..b0b4eb24d592 100644
--- a/include/trace/define_trace.h
+++ b/include/trace/define_trace.h
@@ -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) \