diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-15 03:34:32 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-15 03:34:32 +0200 |
| commit | c0c50b541a4b147c5c2572ed051420238c47f57a (patch) | |
| tree | 7500aefddead1009ed271c5b413f4b4fa89083a1 /include/trace/events/jbd2.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | tracing/function-profiler: do not free per cpu variable stat (diff) | |
| download | linux-c0c50b541a4b147c5c2572ed051420238c47f57a.tar.xz linux-c0c50b541a4b147c5c2572ed051420238c47f57a.zip | |
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 'include/trace/events/jbd2.h')
| -rw-r--r-- | include/trace/events/jbd2.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/trace/events/jbd2.h b/include/trace/events/jbd2.h index 845b0b4b48fd..10813fa0c8d0 100644 --- a/include/trace/events/jbd2.h +++ b/include/trace/events/jbd2.h @@ -1,12 +1,12 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM jbd2 + #if !defined(_TRACE_JBD2_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_JBD2_H #include <linux/jbd2.h> #include <linux/tracepoint.h> -#undef TRACE_SYSTEM -#define TRACE_SYSTEM jbd2 - TRACE_EVENT(jbd2_checkpoint, TP_PROTO(journal_t *journal, int result), |