diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
| commit | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (patch) | |
| tree | d827bca3fc825a0ac33efbcd493713be40fcc812 /fs/gfs2/trace_gfs2.h | |
| parent | cf7a2b4fb6a9b86779930a0a123b0df41aa9208f (diff) | |
| parent | f17a1f06d2fa93f4825be572622eb02c4894db4e (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
Diffstat (limited to 'fs/gfs2/trace_gfs2.h')
| -rw-r--r-- | fs/gfs2/trace_gfs2.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/gfs2/trace_gfs2.h b/fs/gfs2/trace_gfs2.h index 98d6ef1c1dc0..148d55c14171 100644 --- a/fs/gfs2/trace_gfs2.h +++ b/fs/gfs2/trace_gfs2.h | |||
| @@ -1,12 +1,11 @@ | |||
| 1 | #undef TRACE_SYSTEM | ||
| 2 | #define TRACE_SYSTEM gfs2 | ||
| 3 | |||
| 1 | #if !defined(_TRACE_GFS2_H) || defined(TRACE_HEADER_MULTI_READ) | 4 | #if !defined(_TRACE_GFS2_H) || defined(TRACE_HEADER_MULTI_READ) |
| 2 | #define _TRACE_GFS2_H | 5 | #define _TRACE_GFS2_H |
| 3 | 6 | ||
| 4 | #include <linux/tracepoint.h> | 7 | #include <linux/tracepoint.h> |
| 5 | 8 | ||
| 6 | #undef TRACE_SYSTEM | ||
| 7 | #define TRACE_SYSTEM gfs2 | ||
| 8 | #define TRACE_INCLUDE_FILE trace_gfs2 | ||
| 9 | |||
| 10 | #include <linux/fs.h> | 9 | #include <linux/fs.h> |
| 11 | #include <linux/buffer_head.h> | 10 | #include <linux/buffer_head.h> |
| 12 | #include <linux/dlmconstants.h> | 11 | #include <linux/dlmconstants.h> |
| @@ -403,5 +402,6 @@ TRACE_EVENT(gfs2_block_alloc, | |||
| 403 | /* This part must be outside protection */ | 402 | /* This part must be outside protection */ |
| 404 | #undef TRACE_INCLUDE_PATH | 403 | #undef TRACE_INCLUDE_PATH |
| 405 | #define TRACE_INCLUDE_PATH . | 404 | #define TRACE_INCLUDE_PATH . |
| 405 | #define TRACE_INCLUDE_FILE trace_gfs2 | ||
| 406 | #include <trace/define_trace.h> | 406 | #include <trace/define_trace.h> |
| 407 | 407 | ||