From 4ce95041e3b552458f693daf8b211bc3fc414fe6 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Thu, 22 Nov 2018 19:40:39 +0000
Subject: [PATCH] scst: Suppress a recently introduced compiler warning

Avoid that the following compiler warning appears when building against
a stable kernel with version number >= v3.18 and < v4.12:

      warning: "EPOLLERR" redefined [enabled by default]



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7826 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scst/include/backport.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scst/include/backport.h b/scst/include/backport.h
index b0e091486..72532b189 100644
--- a/scst/include/backport.h
+++ b/scst/include/backport.h
@@ -25,6 +25,7 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
 #include <linux/bsg-lib.h>	/* struct bsg_job */
 #endif
+#include <linux/eventpoll.h>
 #include <linux/scatterlist.h>	/* struct scatterlist */
 #include <linux/slab.h>		/* kmalloc() */
 #include <linux/stddef.h>	/* sizeof_field() */
@@ -309,9 +310,11 @@ typedef unsigned int __poll_t;
 #define EPOLLNVAL	POLLNVAL
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) && !defined(EPOLLIN)
 /*
  * See also commit 7e040726850a ("eventpoll.h: add missing epoll event masks").
+ * Note: this commit got backported to multiple stable kernels, including
+ * v3.18.93.
  */
 #define EPOLLIN		POLLIN
 #define EPOLLPRI	POLLPRI