aboutsummaryrefslogtreecommitdiffstats
path: root/eventpoll.h-fix-epoll-event-masks.patch
diff options
Diffstat (limited to 'eventpoll.h-fix-epoll-event-masks.patch')
-rw-r--r--eventpoll.h-fix-epoll-event-masks.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/eventpoll.h-fix-epoll-event-masks.patch b/eventpoll.h-fix-epoll-event-masks.patch
new file mode 100644
index 00000000000000..7858a5b149392a
--- /dev/null
+++ b/eventpoll.h-fix-epoll-event-masks.patch
@@ -0,0 +1,45 @@
+From foo@baz Thu Feb 23 18:35:58 CET 2017
+Date: Thu, 23 Feb 2017 18:35:58 +0100
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: [PATCH 1/2] eventpoll.h: fix epoll event masks
+
+When userspace tries to use these defines, it complains that it needs to
+be an unsigned 1 that is shifted, so libc implementations have to create
+their own version. Fix this by defining it properly so that libcs can
+just use the kernel uapi header.
+
+Reported-by: Elliott Hughes <enh@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/uapi/linux/eventpoll.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/include/uapi/linux/eventpoll.h
++++ b/include/uapi/linux/eventpoll.h
+@@ -27,7 +27,7 @@
+ #define EPOLL_CTL_MOD 3
+
+ /* Set exclusive wakeup mode for the target file descriptor */
+-#define EPOLLEXCLUSIVE (1 << 28)
++#define EPOLLEXCLUSIVE (1U << 28)
+
+ /*
+ * Request the handling of system wakeup events so as to prevent system suspends
+@@ -39,13 +39,13 @@
+ *
+ * Requires CAP_BLOCK_SUSPEND
+ */
+-#define EPOLLWAKEUP (1 << 29)
++#define EPOLLWAKEUP (1U << 29)
+
+ /* Set the One Shot behaviour for the target file descriptor */
+-#define EPOLLONESHOT (1 << 30)
++#define EPOLLONESHOT (1U << 30)
+
+ /* Set the Edge Triggered behaviour for the target file descriptor */
+-#define EPOLLET (1 << 31)
++#define EPOLLET (1U << 31)
+
+ /*
+ * On x86-64 make the 64bit structure have the same alignment as the