gator: Version 5.19

[firefly-linux-kernel-4.4.55.git] / drivers / gator / gator_events_block.c

diff --git a/drivers/gator/gator_events_block.c b/drivers/gator/gator_events_block.c
index b2bc414e462e4df23b86e40abfa04ba55e9e974a..03eed4fb9ebb057003e0e5d7b8e61f14490ba69e 100644 (file)
--- a/drivers/gator/gator_events_block.c
+++ b/drivers/gator/gator_events_block.c
@@ -28,15 +28,25 @@ static ulong block_rq_rd_key;
 static atomic_t blockCnt[BLOCK_TOTAL];
 static int blockGet[BLOCK_TOTAL * 4];
 
+// Tracepoint changed in 3.15 backported to older kernels. The Makefile tries to autodetect the correct value, but if it fails change the #if below
+#if OLD_BLOCK_RQ_COMPLETE
 GATOR_DEFINE_PROBE(block_rq_complete, TP_PROTO(struct request_queue *q, struct request *rq))
+#else
+GATOR_DEFINE_PROBE(block_rq_complete, TP_PROTO(struct request_queue *q, struct request *rq, unsigned int nr_bytes))
+#endif
 {
-       int write, size;
+       int write;
+       unsigned int size;
 
        if (!rq)
                return;
 
        write = rq->cmd_flags & EVENTWRITE;
+#if OLD_BLOCK_RQ_COMPLETE
        size = rq->resid_len;
+#else
+       size = nr_bytes;
+#endif
 
        if (!size)
                return;