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 /* struct bsg_job */ #endif +#include #include /* struct scatterlist */ #include /* kmalloc() */ #include /* 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