diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-07-18 06:19:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-07-18 06:20:01 -0400 |
| commit | 45bceffc3013bda7d2ebc7802e9b153b674e2d44 (patch) | |
| tree | 222d7dd8fd300925cbf12cdc0fba5bee2528997e /include/trace/events/block.h | |
| parent | 6f2f3cf00ee32f75ba007a46bab88a54d68a5deb (diff) | |
| parent | 78af08d90b8f745044b1274430bc4bc6b2b27aca (diff) | |
Merge branch 'linus' into tracing/core
Merge reason: tracing/core was on an older, pre-rc1 base.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/trace/events/block.h')
| -rw-r--r-- | include/trace/events/block.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/trace/events/block.h b/include/trace/events/block.h index d6b05f42dd44..9a74b468a229 100644 --- a/include/trace/events/block.h +++ b/include/trace/events/block.h | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | #undef TRACE_SYSTEM | ||
| 2 | #define TRACE_SYSTEM block | ||
| 3 | |||
| 1 | #if !defined(_TRACE_BLOCK_H) || defined(TRACE_HEADER_MULTI_READ) | 4 | #if !defined(_TRACE_BLOCK_H) || defined(TRACE_HEADER_MULTI_READ) |
| 2 | #define _TRACE_BLOCK_H | 5 | #define _TRACE_BLOCK_H |
| 3 | 6 | ||
| @@ -5,9 +8,6 @@ | |||
| 5 | #include <linux/blkdev.h> | 8 | #include <linux/blkdev.h> |
| 6 | #include <linux/tracepoint.h> | 9 | #include <linux/tracepoint.h> |
| 7 | 10 | ||
| 8 | #undef TRACE_SYSTEM | ||
| 9 | #define TRACE_SYSTEM block | ||
| 10 | |||
| 11 | TRACE_EVENT(block_rq_abort, | 11 | TRACE_EVENT(block_rq_abort, |
| 12 | 12 | ||
| 13 | TP_PROTO(struct request_queue *q, struct request *rq), | 13 | TP_PROTO(struct request_queue *q, struct request *rq), |