commit 1bc1e4d048d372a0191e78124b247747864dfde3
author Steven Rostedt (Red Hat) <rostedt@goodmis.org> Mon Apr 06 23:02:22 2015 -0400
committer Steven Rostedt <rostedt@goodmis.org> Tue Apr 07 12:32:09 2015 -0400
tree 6303e0fe1a01336fe2dd5d0733ebfe9623d5b49b
parent 7267b23859ba4188873e3d1c90c9b29031cc9356

mac80211: Move message tracepoints to their own header

Every tracing file must have its own TRACE_SYSTEM defined.
The mac80211 tracepoint header broke this and add in the middle
of the file had:

 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM mac80211_msg

Unfortunately, this broke new code in the ftrace infrastructure.
Moving the mac80211_msg into its own trace file with its own
TRACE_SYSTEM defined fixes the issue.

Link: http://lkml.kernel.org/r/1428389938.1841.1.camel@sipsolutions.net

Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

net/mac80211/trace.c

diff --git a/net/mac80211/trace.c b/net/mac80211/trace.c
index 386e45d8..edfe0c1 100644
--- a/net/mac80211/trace.c
+++ b/net/mac80211/trace.c
@@ -8,6 +8,7 @@
 #include "debug.h"
 #define CREATE_TRACE_POINTS
 #include "trace.h"
+#include "trace_msg.h"
 
 #ifdef CONFIG_MAC80211_MESSAGE_TRACING
 void __sdata_info(const char *fmt, ...)