[BZ #17930] MIPS: Define SHM_NORESERVE.

	[BZ #17930]
	* sysdeps/unix/sysv/linux/mips/bits/shm.h (SHM_NORESERVE): Define.

diff --git a/ChangeLog b/ChangeLog
index c0d3aca79d2c176522e362ecc3a7eb0f7fcc2971..557871a7f284bb3139490dd09282d5b2eda7df4b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-07  James Cowgill  <james410@cowgill.org.uk>
+
+       [BZ #17930]
+       * sysdeps/unix/sysv/linux/mips/bits/shm.h (SHM_NORESERVE): Define.
+
 2015-04-07  Florian Weimer  <fweimer@redhat.com>
 
        * malloc/scratch_buffer_grow_preserve.c: Include <string.h>

diff --git a/NEWS b/NEWS
index deadf2e815c3f20e4cbef4fbee6493425432c3ba..d36fed56b2f9f2dd34474297eb34b66f0f120bd6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,10 +12,10 @@ Version 2.22
   4719, 13064, 14094, 14841, 14906, 15319, 15467, 15790, 15969, 16351,
   16512, 16560, 16783, 16850, 17090, 17195, 17269, 17523, 17542, 17569,
   17588, 17596, 17620, 17621, 17628, 17631, 17711, 17776, 17779, 17792,
-  17836, 17912, 17916, 17932, 17944, 17949, 17964, 17965, 17967, 17969,
-  17978, 17987, 17991, 17996, 17998, 17999, 18019, 18020, 18029, 18030,
-  18032, 18036, 18038, 18039, 18042, 18043, 18046, 18047, 18068, 18080,
-  18093, 18100, 18104, 18110, 18111, 18128, 18138, 18185.
+  17836, 17912, 17916, 17930, 17932, 17944, 17949, 17964, 17965, 17967,
+  17969, 17978, 17987, 17991, 17996, 17998, 17999, 18019, 18020, 18029,
+  18030, 18032, 18036, 18038, 18039, 18042, 18043, 18046, 18047, 18068,
+  18080, 18093, 18100, 18104, 18110, 18111, 18128, 18138, 18185.
 
 * A powerpc and powerpc64 optimization for TLS, similar to TLS descriptors
   for LD and GD on x86 and x86-64, has been implemented.  You will need

diff --git a/sysdeps/unix/sysv/linux/mips/bits/shm.h b/sysdeps/unix/sysv/linux/mips/bits/shm.h
index 6dc66d0d0967e8b797924561d256f754e136d3d5..c8d035b140445bc8e266491ac28b88b8ca568043 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/bits/shm.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/shm.h
@@ -67,6 +67,7 @@ struct shmid_ds
 # define SHM_DEST      01000   /* segment will be destroyed on last detach */
 # define SHM_LOCKED    02000   /* segment will not be swapped */
 # define SHM_HUGETLB   04000   /* segment is mapped via hugetlb */
+# define SHM_NORESERVE 010000  /* don't check for reservations */
 
 struct shminfo
   {