From e0419dd425ece95e3eb35b25ec1663abcd6022ae Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Thu, 1 Nov 2018 03:57:12 +0000
Subject: [PATCH] ib_srpt: Declare second srpt_get_u64_x() argument const
 (merge r7281 from trunk)

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7536 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scst/include/backport.h | 12 ++++++++++++
 srpt/src/ib_srpt.c      | 10 ----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/scst/include/backport.h b/scst/include/backport.h
index 75af117c9..88f5fa971 100644
--- a/scst/include/backport.h
+++ b/scst/include/backport.h
@@ -38,6 +38,18 @@
 #define smp_mb__after_atomic_dec smp_mb__after_atomic
 #endif
 
+/* <asm-generic/bug.h> */
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) && !defined(WARN)
+/* See also commit a8f18b909c0a3f22630846207035c8b84bb252b8 */
+#define WARN(condition, format...) do {		\
+	if (unlikely(condition)) {		\
+		printk(KERN_WARNING format);	\
+		WARN_ON(true);			\
+	}					\
+} while (0)
+#endif
+
 /* <asm-generic/fcntl.h> */
 
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 32)
diff --git a/srpt/src/ib_srpt.c b/srpt/src/ib_srpt.c
index d006cf288..590a4e9e2 100644
--- a/srpt/src/ib_srpt.c
+++ b/srpt/src/ib_srpt.c
@@ -68,16 +68,6 @@
 #include "scst_debug.h"
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) && !defined(WARN)
-/* See also commit a8f18b909c0a3f22630846207035c8b84bb252b8 */
-#define WARN(condition, format...) do {		\
-	if (unlikely(condition)) {		\
-		printk(KERN_WARNING format);	\
-		WARN_ON(true);			\
-	}					\
-} while (0)
-#endif
-
 /* Name of this kernel module. */
 #define DRV_NAME		"ib_srpt"
 #define DRV_VERSION		"3.3.0-rc#" __stringify(OFED_FLAVOR)