3.18-stable patches

added patches:
	eventpoll.h-add-missing-epoll-event-masks.patch

diff --git a/queue-3.18/eventpoll.h-add-missing-epoll-event-masks.patch b/queue-3.18/eventpoll.h-add-missing-epoll-event-masks.patch
new file mode 100644 (file)
index 0000000..0c0d87e
--- /dev/null
+++ b/queue-3.18/eventpoll.h-add-missing-epoll-event-masks.patch
@@ -0,0 +1,48 @@
+From 7e040726850a106587485c21bdacc0bfc8a0cbed Mon Sep 17 00:00:00 2001
+From: Greg KH <gregkh@linuxfoundation.org>
+Date: Wed, 8 Mar 2017 19:03:44 +0100
+Subject: eventpoll.h: add missing epoll event masks
+
+From: Greg KH <gregkh@linuxfoundation.org>
+
+commit 7e040726850a106587485c21bdacc0bfc8a0cbed upstream.
+
+[resend due to me forgetting to cc: linux-api the first time around I
+posted these back on Feb 23]
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+For some reason these values are not in the uapi header file, so any
+libc has to define it themselves.  To prevent them from needing to do
+this, just have the kernel provide the correct values.
+
+Reported-by: Elliott Hughes <enh@google.com>
+Signed-off-by: Greg Hackmann <ghackmann@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/uapi/linux/eventpoll.h |   13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+--- a/include/uapi/linux/eventpoll.h
++++ b/include/uapi/linux/eventpoll.h
+@@ -26,6 +26,19 @@
+ #define EPOLL_CTL_DEL 2
+ #define EPOLL_CTL_MOD 3
+ 
++/* Epoll event masks */
++#define EPOLLIN               0x00000001
++#define EPOLLPRI      0x00000002
++#define EPOLLOUT      0x00000004
++#define EPOLLERR      0x00000008
++#define EPOLLHUP      0x00000010
++#define EPOLLRDNORM   0x00000040
++#define EPOLLRDBAND   0x00000080
++#define EPOLLWRNORM   0x00000100
++#define EPOLLWRBAND   0x00000200
++#define EPOLLMSG      0x00000400
++#define EPOLLRDHUP    0x00002000
++
+ /*
+  * Request the handling of system wakeup events so as to prevent system suspends
+  * from happening while those events are being processed.

diff --git a/queue-3.18/series b/queue-3.18/series
index f3a279da131e103084f0a64ff4bfebbfd68e2ef5..cd5ea76eae975bd2d3fbad18ba26987fb15e8aa4 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -34,3 +34,4 @@ reiserfs-don-t-preallocate-blocks-for-extended-attributes.patch
 fs-fcntl-f_setown-avoid-undefined-behaviour.patch
 scsi-libiscsi-fix-shifting-of-did_requeue-host-byte.patch
 um-link-vmlinux-with-no-pie.patch
+eventpoll.h-add-missing-epoll-event-masks.patch