summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-14 18:34:32 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-14 18:34:32 -0700
commitc0c50b541a4b147c5c2572ed051420238c47f57a (patch)
tree7500aefddead1009ed271c5b413f4b4fa89083a1 /fs
parenta376d446771710790f5f3425172b467bf8578e22 (diff)
parent6ab5d668b131d3c5416f6df1d3ca95b82d4fe8a2 (diff)
downloadop-kernel-dev-c0c50b541a4b147c5c2572ed051420238c47f57a.zip
op-kernel-dev-c0c50b541a4b147c5c2572ed051420238c47f57a.tar.gz
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: tracing/function-profiler: do not free per cpu variable stat tracing/events: Move TRACE_SYSTEM outside of include guard
Diffstat (limited to 'fs')
-rw-r--r--fs/gfs2/trace_gfs2.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/gfs2/trace_gfs2.h b/fs/gfs2/trace_gfs2.h
index 98d6ef1..148d55c 100644
--- a/fs/gfs2/trace_gfs2.h
+++ b/fs/gfs2/trace_gfs2.h
@@ -1,12 +1,11 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM gfs2
+
#if !defined(_TRACE_GFS2_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_GFS2_H
#include <linux/tracepoint.h>
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM gfs2
-#define TRACE_INCLUDE_FILE trace_gfs2
-
#include <linux/fs.h>
#include <linux/buffer_head.h>
#include <linux/dlmconstants.h>
@@ -403,5 +402,6 @@ TRACE_EVENT(gfs2_block_alloc,
/* This part must be outside protection */
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH .
+#define TRACE_INCLUDE_FILE trace_gfs2
#include <trace/define_trace.h>
OpenPOWER on IntegriCloud