Merge Linux 3.5 epoll changes

Add EPOLLWAKEUP.

diff --git a/ports/ChangeLog.hppa b/ports/ChangeLog.hppa
index e588a7853fed72bab13de39d9f0b4aeebdc47d38..83d298fe4a8df02cd658a7233fe8af997e35018d 100644 (file)
--- a/ports/ChangeLog.hppa
+++ b/ports/ChangeLog.hppa
@@ -1,3 +1,8 @@
+2012-07-26  Andreas Jaeger  <aj@suse.de>
+
+       * sysdeps/unix/sysv/linux/hppa/sys/epoll.h (EPOLLWAKEUP): Add new
+       value.
+
 2012-05-19  Carlos O'Donell  <carlos@systemhalted.org>
 
        * sysdeps/hppa/add_n.s: Rename this...

diff --git a/ports/sysdeps/unix/sysv/linux/hppa/sys/epoll.h b/ports/sysdeps/unix/sysv/linux/hppa/sys/epoll.h
index 0adf09029e4fd0e13f7eb28d826618b0cca83128..e06d5668f7f28cbbc2f64b326769b3da714d816b 100644 (file)
--- a/ports/sysdeps/unix/sysv/linux/hppa/sys/epoll.h
+++ b/ports/sysdeps/unix/sysv/linux/hppa/sys/epoll.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2009, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -64,6 +64,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

diff --git a/sysdeps/unix/sysv/linux/sys/epoll.h b/sysdeps/unix/sysv/linux/sys/epoll.h
index a55ebad6226374eaedffdc8067e8f7e274a3c04a..6c2f10aab93e77c1eaa8544b140bc30151d11c21 100644 (file)
--- 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