aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--bits/mman-linux.h1
-rw-r--r--sysdeps/unix/sysv/linux/bits/in.h1
-rw-r--r--sysdeps/unix/sysv/linux/hppa/bits/mman.h1
-rw-r--r--sysdeps/unix/sysv/linux/sys/epoll.h2
5 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 993e7f21bd..41335b99ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2016-03-14 Joseph Myers <joseph@codesourcery.com>
+
+ * bits/mman-linux.h [__USE_MISC] (MADV_FREE): New macro.
+ * sysdeps/unix/sysv/linux/hppa/bits/mman.h [__USE_MISC]
+ (MADV_FREE): Likewise.
+ * sysdeps/unix/sysv/linux/bits/in.h (IPV6_HDRINCL): Likewise.
+ * sysdeps/unix/sysv/linux/sys/epoll.h (enum EPOLL_EVENTS): Add
+ EPOLLEXCLUSIVE.
+
2016-03-14 Carlos O'Donell <carlos@redhat.com>
* timezone/README: Remove mention of checktab.awk. Mention wiki
diff --git a/bits/mman-linux.h b/bits/mman-linux.h
index dbb994bf4d..29986d3cd2 100644
--- a/bits/mman-linux.h
+++ b/bits/mman-linux.h
@@ -81,6 +81,7 @@
# define MADV_SEQUENTIAL 2 /* Expect sequential page references. */
# define MADV_WILLNEED 3 /* Will need these pages. */
# define MADV_DONTNEED 4 /* Don't need these pages. */
+# define MADV_FREE 8 /* Free pages only if memory pressure. */
# define MADV_REMOVE 9 /* Remove these pages and resources. */
# define MADV_DONTFORK 10 /* Do not inherit across fork. */
# define MADV_DOFORK 11 /* Do inherit across fork. */
diff --git a/sysdeps/unix/sysv/linux/bits/in.h b/sysdeps/unix/sysv/linux/bits/in.h
index 3b01f12d93..d75c07b9fd 100644
--- a/sysdeps/unix/sysv/linux/bits/in.h
+++ b/sysdeps/unix/sysv/linux/bits/in.h
@@ -184,6 +184,7 @@ struct in_pktinfo
#define IPV6_LEAVE_ANYCAST 28
#define IPV6_IPSEC_POLICY 34
#define IPV6_XFRM_POLICY 35
+#define IPV6_HDRINCL 36
/* Advanced API (RFC3542) (1). */
#define IPV6_RECVPKTINFO 49
diff --git a/sysdeps/unix/sysv/linux/hppa/bits/mman.h b/sysdeps/unix/sysv/linux/hppa/bits/mman.h
index cbb3ab5a48..ff2db1157d 100644
--- a/sysdeps/unix/sysv/linux/hppa/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/hppa/bits/mman.h
@@ -88,6 +88,7 @@
# define MADV_SPACEAVAIL 5 /* Insure that resources are reserved */
# define MADV_VPS_PURGE 6 /* Purge pages from VM page cache */
# define MADV_VPS_INHERIT 7 /* Inherit parents page size */
+# define MADV_FREE 8 /* Free pages only if memory pressure. */
# define MADV_REMOVE 9 /* Remove these pages and resources. */
# define MADV_DONTFORK 10 /* Do not inherit across fork. */
# define MADV_DOFORK 11 /* Do inherit across fork. */
diff --git a/sysdeps/unix/sysv/linux/sys/epoll.h b/sysdeps/unix/sysv/linux/sys/epoll.h
index 72ec211b95..90adf60260 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
+ EPOLLEXCLUSIVE = 1u << 28,
+#define EPOLLEXCLUSIVE EPOLLEXCLUSIVE
EPOLLWAKEUP = 1u << 29,
#define EPOLLWAKEUP EPOLLWAKEUP
EPOLLONESHOT = 1u << 30,