Messages in this thread Patch in this message | | | Subject | [PATCH][GIT PULL] tracing/mac80211: Move TRACE_SYSTEM out of #if protection | From | Steven Rostedt <> | Date | Tue, 06 Apr 2010 21:57:57 -0400 |
| |
John,
You can pull this or just use this patch. Which ever you prefer.
Please pull the latest wireless tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git wireless
Steven Rostedt (1): tracing/mac80211: Move TRACE_SYSTEM out of #if protection
---- net/mac80211/driver-trace.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --------------------------- commit 27322da6e367b9e83d6b734f9a9ca3b8827d7b24 Author: Steven Rostedt <srostedt@redhat.com> Date: Tue Apr 6 21:50:55 2010 -0400
tracing/mac80211: Move TRACE_SYSTEM out of #if protection As explained in: commit d0b6e04a4cd8360e3c9c419f7c30a3081a0c142a tracing/events: Move TRACE_SYSTEM outside of include guard The TRACE_SYSTEM must be outside the #if include protection. Cc: Johannes Berg <johannes@sipsolutions.net> Cc: John W. Linville <linville@tuxdriver.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
diff --git a/net/mac80211/driver-trace.h b/net/mac80211/driver-trace.h index 41baf73..f5a4239 100644 --- a/net/mac80211/driver-trace.h +++ b/net/mac80211/driver-trace.h @@ -1,3 +1,6 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM mac80211 + #if !defined(__MAC80211_DRIVER_TRACE) || defined(TRACE_HEADER_MULTI_READ) #define __MAC80211_DRIVER_TRACE @@ -11,9 +14,6 @@ static inline void trace_ ## name(proto) {} #endif -#undef TRACE_SYSTEM -#define TRACE_SYSTEM mac80211 - #define MAXNAME 32 #define LOCAL_ENTRY __array(char, wiphy_name, 32) #define LOCAL_ASSIGN strlcpy(__entry->wiphy_name, wiphy_name(local->hw.wiphy), MAXNAME)
| |