aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cowgill <james410@cowgill.org.uk>2015-04-07 17:23:54 +0000
committerJoseph Myers <joseph@codesourcery.com>2015-04-07 17:23:54 +0000
commitd5856d06c3ef62907f2865c502ada4baf3c9efa1 (patch)
tree10fde33a407ad56e0da65af9818821e94d9ca2a1
parent72301304a5655662baf2bae88a7aceeabc4a753e (diff)
downloadglibc-d5856d06c3ef62907f2865c502ada4baf3c9efa1.zip
glibc-d5856d06c3ef62907f2865c502ada4baf3c9efa1.tar.gz
glibc-d5856d06c3ef62907f2865c502ada4baf3c9efa1.tar.bz2
[BZ #17930] MIPS: Define SHM_NORESERVE.
[BZ #17930] * sysdeps/unix/sysv/linux/mips/bits/shm.h (SHM_NORESERVE): Define.
-rw-r--r--ChangeLog5
-rw-r--r--NEWS8
-rw-r--r--sysdeps/unix/sysv/linux/mips/bits/shm.h1
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c0d3aca..557871a 100644
--- 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 deadf2e..d36fed5 100644
--- 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 6dc66d0..c8d035b1 100644
--- 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
{