From: Mathieu Desnoyers Date: Sat, 30 Mar 2013 01:38:27 +0000 (-0400) Subject: block: update instrumentation to 3.9 rc kernel X-Git-Tag: v2.2.0-rc1~4 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=fa7c32a4ef302e709f138e7307b6dbe5efd16e0d;p=lttng-modules.git block: update instrumentation to 3.9 rc kernel Signed-off-by: Mathieu Desnoyers --- diff --git a/instrumentation/events/lttng-module/block.h b/instrumentation/events/lttng-module/block.h index d42ebd4e..e8258bfe 100644 --- a/instrumentation/events/lttng-module/block.h +++ b/instrumentation/events/lttng-module/block.h @@ -313,7 +313,11 @@ TRACE_EVENT(block_bio_bounce, */ TRACE_EVENT(block_bio_complete, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) + TP_PROTO(struct bio *bio, int error), + + TP_ARGS(bio, error), +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) TP_PROTO(struct request_queue *q, struct bio *bio, int error), TP_ARGS(q, bio, error), @@ -389,9 +393,15 @@ DECLARE_EVENT_CLASS(block_bio, */ DEFINE_EVENT(block_bio, block_bio_backmerge, +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) + TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio), + + TP_ARGS(q, rq, bio) +#else TP_PROTO(struct request_queue *q, struct bio *bio), TP_ARGS(q, bio) +#endif ) /** @@ -404,9 +414,15 @@ DEFINE_EVENT(block_bio, block_bio_backmerge, */ DEFINE_EVENT(block_bio, block_bio_frontmerge, +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) + TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio), + + TP_ARGS(q, rq, bio) +#else TP_PROTO(struct request_queue *q, struct bio *bio), TP_ARGS(q, bio) +#endif ) /**