diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-25 04:04:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-25 04:04:32 -0400 |
| commit | daedc71836e5a398fd0cc0e12c5cb43539478485 (patch) | |
| tree | c56567a92017679e57195cef992d4a5561c20e0e /include/trace/events/jbd2.h | |
| parent | c36ba80ea01d0aecb652c26799a912e760ce8981 (diff) | |
| parent | 422bef879e84104fee6dc68ded0e371dbeb5f88e (diff) | |
Merge commit 'v2.6.31-rc7' into irq/core
Merge reason: move from an -rc2 base to -rc7.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 @@ | |||
| 1 | #undef TRACE_SYSTEM | ||
| 2 | #define TRACE_SYSTEM jbd2 | ||
| 3 | |||
| 1 | #if !defined(_TRACE_JBD2_H) || defined(TRACE_HEADER_MULTI_READ) | 4 | #if !defined(_TRACE_JBD2_H) || defined(TRACE_HEADER_MULTI_READ) |
| 2 | #define _TRACE_JBD2_H | 5 | #define _TRACE_JBD2_H |
| 3 | 6 | ||
| 4 | #include <linux/jbd2.h> | 7 | #include <linux/jbd2.h> |
| 5 | #include <linux/tracepoint.h> | 8 | #include <linux/tracepoint.h> |
| 6 | 9 | ||
| 7 | #undef TRACE_SYSTEM | ||
| 8 | #define TRACE_SYSTEM jbd2 | ||
| 9 | |||
| 10 | TRACE_EVENT(jbd2_checkpoint, | 10 | TRACE_EVENT(jbd2_checkpoint, |
| 11 | 11 | ||
| 12 | TP_PROTO(journal_t *journal, int result), | 12 | TP_PROTO(journal_t *journal, int result), |