Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[safe/jmp/linux-2.6] / include / trace / block.h

diff --git a/include/trace/block.h b/include/trace/block.h
index 3cc2675..25b7068 100644 (file)
--- a/include/trace/block.h
+++ b/include/trace/block.h
@@ -4,57 +4,73 @@
 #include <linux/blkdev.h>
 #include <linux/tracepoint.h>
 
-DEFINE_TRACE(block_rq_abort,
-       TPPROTO(struct request_queue *q, struct request *rq),
-       TPARGS(q, rq));
-DEFINE_TRACE(block_rq_insert,
-       TPPROTO(struct request_queue *q, struct request *rq),
-       TPARGS(q, rq));
-DEFINE_TRACE(block_rq_issue,
-       TPPROTO(struct request_queue *q, struct request *rq),
-       TPARGS(q, rq));
-DEFINE_TRACE(block_rq_requeue,
-       TPPROTO(struct request_queue *q, struct request *rq),
-       TPARGS(q, rq));
-DEFINE_TRACE(block_rq_complete,
-       TPPROTO(struct request_queue *q, struct request *rq),
-       TPARGS(q, rq));
-DEFINE_TRACE(block_bio_bounce,
-       TPPROTO(struct request_queue *q, struct bio *bio),
-       TPARGS(q, bio));
-DEFINE_TRACE(block_bio_complete,
-       TPPROTO(struct request_queue *q, struct bio *bio),
-       TPARGS(q, bio));
-DEFINE_TRACE(block_bio_backmerge,
-       TPPROTO(struct request_queue *q, struct bio *bio),
-       TPARGS(q, bio));
-DEFINE_TRACE(block_bio_frontmerge,
-       TPPROTO(struct request_queue *q, struct bio *bio),
-       TPARGS(q, bio));
-DEFINE_TRACE(block_bio_queue,
-       TPPROTO(struct request_queue *q, struct bio *bio),
-       TPARGS(q, bio));
-DEFINE_TRACE(block_getrq,
-       TPPROTO(struct request_queue *q, struct bio *bio, int rw),
-       TPARGS(q, bio, rw));
-DEFINE_TRACE(block_sleeprq,
-       TPPROTO(struct request_queue *q, struct bio *bio, int rw),
-       TPARGS(q, bio, rw));
-DEFINE_TRACE(block_plug,
-       TPPROTO(struct request_queue *q),
-       TPARGS(q));
-DEFINE_TRACE(block_unplug_timer,
-       TPPROTO(struct request_queue *q),
-       TPARGS(q));
-DEFINE_TRACE(block_unplug_io,
-       TPPROTO(struct request_queue *q),
-       TPARGS(q));
-DEFINE_TRACE(block_split,
-       TPPROTO(struct request_queue *q, struct bio *bio, unsigned int pdu),
-       TPARGS(q, bio, pdu));
-DEFINE_TRACE(block_remap,
-       TPPROTO(struct request_queue *q, struct bio *bio, dev_t dev,
-               sector_t from, sector_t to),
-       TPARGS(q, bio, dev, from, to));
+DECLARE_TRACE(block_rq_abort,
+       TP_PROTO(struct request_queue *q, struct request *rq),
+             TP_ARGS(q, rq));
+
+DECLARE_TRACE(block_rq_insert,
+       TP_PROTO(struct request_queue *q, struct request *rq),
+             TP_ARGS(q, rq));
+
+DECLARE_TRACE(block_rq_issue,
+       TP_PROTO(struct request_queue *q, struct request *rq),
+             TP_ARGS(q, rq));
+
+DECLARE_TRACE(block_rq_requeue,
+       TP_PROTO(struct request_queue *q, struct request *rq),
+             TP_ARGS(q, rq));
+
+DECLARE_TRACE(block_rq_complete,
+       TP_PROTO(struct request_queue *q, struct request *rq),
+             TP_ARGS(q, rq));
+
+DECLARE_TRACE(block_bio_bounce,
+       TP_PROTO(struct request_queue *q, struct bio *bio),
+             TP_ARGS(q, bio));
+
+DECLARE_TRACE(block_bio_complete,
+       TP_PROTO(struct request_queue *q, struct bio *bio),
+             TP_ARGS(q, bio));
+
+DECLARE_TRACE(block_bio_backmerge,
+       TP_PROTO(struct request_queue *q, struct bio *bio),
+             TP_ARGS(q, bio));
+
+DECLARE_TRACE(block_bio_frontmerge,
+       TP_PROTO(struct request_queue *q, struct bio *bio),
+             TP_ARGS(q, bio));
+
+DECLARE_TRACE(block_bio_queue,
+       TP_PROTO(struct request_queue *q, struct bio *bio),
+             TP_ARGS(q, bio));
+
+DECLARE_TRACE(block_getrq,
+       TP_PROTO(struct request_queue *q, struct bio *bio, int rw),
+             TP_ARGS(q, bio, rw));
+
+DECLARE_TRACE(block_sleeprq,
+       TP_PROTO(struct request_queue *q, struct bio *bio, int rw),
+             TP_ARGS(q, bio, rw));
+
+DECLARE_TRACE(block_plug,
+       TP_PROTO(struct request_queue *q),
+             TP_ARGS(q));
+
+DECLARE_TRACE(block_unplug_timer,
+       TP_PROTO(struct request_queue *q),
+             TP_ARGS(q));
+
+DECLARE_TRACE(block_unplug_io,
+       TP_PROTO(struct request_queue *q),
+             TP_ARGS(q));
+
+DECLARE_TRACE(block_split,
+       TP_PROTO(struct request_queue *q, struct bio *bio, unsigned int pdu),
+             TP_ARGS(q, bio, pdu));
+
+DECLARE_TRACE(block_remap,
+       TP_PROTO(struct request_queue *q, struct bio *bio, dev_t dev,
+                sector_t from, sector_t to),
+             TP_ARGS(q, bio, dev, from, to));
 
 #endif