From e4197190e2ef5afcf857472d328dc6185435333d Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Sun, 18 Sep 2011 13:36:07 -0400 Subject: [PATCH] --- yaml --- r: 274599 b: refs/heads/master c: 67b84999b1a8b1af5625b1eabe92146c5eb42932 h: refs/heads/master i: 274597: d3173e02fc6e9c27e303768bfc06820a5c6cfe3f 274595: 560310c0bd9bf1f232062d81ad61fc604f5611d4 274591: 4ac8daaff41747f62c31db334d2f6a836e9c6bdb v: v3 --- [refs] | 2 +- trunk/include/trace/define_trace.h | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 853f0e64233c..1bbf3b5bbde2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec53cf23c0ddb0c29950b9a4ac46964c4c6c6c2f +refs/heads/master: 67b84999b1a8b1af5625b1eabe92146c5eb42932 diff --git a/trunk/include/trace/define_trace.h b/trunk/include/trace/define_trace.h index da39b22636f7..b0b4eb24d592 100644 --- a/trunk/include/trace/define_trace.h +++ b/trunk/include/trace/define_trace.h @@ -21,16 +21,6 @@ #undef CREATE_TRACE_POINTS #include -/* - * 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 #undef TRACE_EVENT #define TRACE_EVENT(name, proto, args, tstruct, assign, print) \