From 0c98bfd6d387f5d759cfd753f9dbcab2f65ca200 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 4 Nov 2018 17:02:47 +0000
Subject: [PATCH] Merge r7515 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7767 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scst_local/scst_local.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/scst_local/scst_local.c b/scst_local/scst_local.c
index 2d996d870..c963782a6 100644
--- a/scst_local/scst_local.c
+++ b/scst_local/scst_local.c
@@ -11,7 +11,7 @@
  */
 
 #include <linux/module.h>
-
+#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/types.h>
@@ -24,7 +24,15 @@
 #include <linux/slab.h>
 #include <linux/completion.h>
 #include <linux/spinlock.h>
-
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)
+#include <linux/blk-mq.h>
+#else
+#include <linux/blkdev.h>
+static inline u32 blk_mq_unique_tag(struct request *rq)
+{
+	return rq->tag;
+}
+#endif
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_host.h>