diff options
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/define_trace.h | 10 | ||||
| -rw-r--r-- | include/trace/events/module.h | 2 |
2 files changed, 1 insertions, 11 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 @@ | |||
| 21 | #undef CREATE_TRACE_POINTS | 21 | #undef CREATE_TRACE_POINTS |
| 22 | 22 | ||
| 23 | #include <linux/stringify.h> | 23 | #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> | ||
| 34 | 24 | ||
| 35 | #undef TRACE_EVENT | 25 | #undef TRACE_EVENT |
| 36 | #define TRACE_EVENT(name, proto, args, tstruct, assign, print) \ | 26 | #define TRACE_EVENT(name, proto, args, tstruct, assign, print) \ |
diff --git a/include/trace/events/module.h b/include/trace/events/module.h index 21a546d27c0c..161932737416 100644 --- a/include/trace/events/module.h +++ b/include/trace/events/module.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Because linux/module.h has tracepoints in the header, and ftrace.h | 2 | * Because linux/module.h has tracepoints in the header, and ftrace.h |
| 3 | * eventually includes this file, define_trace.h includes linux/module.h | 3 | * used to include this file, define_trace.h includes linux/module.h |
| 4 | * But we do not want the module.h to override the TRACE_SYSTEM macro | 4 | * But we do not want the module.h to override the TRACE_SYSTEM macro |
| 5 | * variable that define_trace.h is processing, so we only set it | 5 | * variable that define_trace.h is processing, so we only set it |
| 6 | * when module events are being processed, which would happen when | 6 | * when module events are being processed, which would happen when |
