about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2012-07-26 13:11:33 +0200
committerAndreas Jaeger <aj@suse.de>2012-07-26 13:11:33 +0200
commitf8d44fdc72253347dae69fd2c4a231efba4fec98 (patch)
tree70c6c38160ddf8c11d1bca0ebf7566effb78a383 /sysdeps
parentbfc07087bf30879023acb498d8b17b4b0affb4e3 (diff)
downloadglibc-f8d44fdc72253347dae69fd2c4a231efba4fec98.tar.gz
glibc-f8d44fdc72253347dae69fd2c4a231efba4fec98.tar.xz
glibc-f8d44fdc72253347dae69fd2c4a231efba4fec98.zip
Merge Linux 3.5 epoll changes
Add EPOLLWAKEUP.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/sysv/linux/sys/epoll.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sysdeps/unix/sysv/linux/sys/epoll.h b/sysdeps/unix/sysv/linux/sys/epoll.h
index a55ebad622..6c2f10aab9 100644
--- a/sysdeps/unix/sysv/linux/sys/epoll.h
+++ b/sysdeps/unix/sysv/linux/sys/epoll.h
@@ -61,6 +61,8 @@ enum EPOLL_EVENTS
 #define EPOLLHUP EPOLLHUP
     EPOLLRDHUP = 0x2000,
 #define EPOLLRDHUP EPOLLRDHUP
+    EPOLLWAKEUP = 1u << 29,
+#define EPOLLWAKEUP EPOLLWAKEUP
     EPOLLONESHOT = 1u << 30,
 #define EPOLLONESHOT EPOLLONESHOT
     EPOLLET = 1u << 31