mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-21 14:46:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2018-11-22 11:40:54 -08:00
parent fa7cf016d9 4ce95041e3
commit 9c15261a3d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scst/include/backport.h
+4 -1
View File
@@ -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