block: update instrumentation to 3.9 rc kernel

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/instrumentation/events/lttng-module/block.h b/instrumentation/events/lttng-module/block.h
index d42ebd4e4cff2fbc73f0b0741bd4916305441b36..e8258bfece9babaf3e0741f1baaa5bd33c6f314d 100644 (file)
--- 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
 )
 
 /**