X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fblock.h;h=6782cbbef08c53a37a33534ed2a393c0d2067400;hb=9a6800e3a7bed25af7a62d7e8cb2ad9a689e5877;hp=d42ebd4e4cff2fbc73f0b0741bd4916305441b36;hpb=7c68b363332170e4db100327ecc9e09b8a79cf29;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/block.h b/instrumentation/events/lttng-module/block.h
index d42ebd4e..6782cbbe 100644
--- a/instrumentation/events/lttng-module/block.h
+++ b/instrumentation/events/lttng-module/block.h
@@ -389,9 +389,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 +410,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
 )
 
 /**