about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2014-05-06 23:31:44 +0200
committerAurelien Jarno <aurelien@aurel32.net>2014-05-07 00:16:48 +0200
commit4df7d90b36f4cd2f51dbbdbdd0f73f9c30640c9e (patch)
tree75276b51d673ba70e742b33c5c0897aa8ce40c76
parent26c9b0117c4d2f9f24beab703beba4eadf3a1abd (diff)
downloadglibc-4df7d90b36f4cd2f51dbbdbdd0f73f9c30640c9e.tar.gz
glibc-4df7d90b36f4cd2f51dbbdbdd0f73f9c30640c9e.tar.xz
glibc-4df7d90b36f4cd2f51dbbdbdd0f73f9c30640c9e.zip
SPARC: add EFD_SEMAPHORE in <bits/eventfd.h> (BZ #16916)
EFD_SEMAPHORE has been added in the main <bits/eventfd.h>, but not in
the SPARC specific version. Fix that.

(cherry picked from commit 83df9ad0cc861ef24f08a88c5a4c055e2516d33c)
-rw-r--r--ChangeLog6
-rw-r--r--NEWS2
-rw-r--r--sysdeps/unix/sysv/linux/sparc/bits/eventfd.h2
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d5c6d8db8..4f0c034d46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-06  Aurelien Jarno  <aurelien@aurel32.net>
+
+        [BZ# 16916]
+        * sysdeps/unix/sysv/linux/sparc/bits/eventfd.h (EFD_SEMAPHORE):
+        Define.
+
 2014-05-01  David S. Miller  <davem@davemloft.net>
 
 	[BZ #16885]
diff --git a/NEWS b/NEWS
index 831d1eaedc..a182e4c66a 100644
--- a/NEWS
+++ b/NEWS
@@ -8,7 +8,7 @@ using `glibc' in the "product" field.
 Version 2.17.1
 
 * The following bugs are resolved with this release:
-  15003, 15006, 15073, 15122, 15759, 16510, 16885.
+  15003, 15006, 15073, 15122, 15759, 16510, 16885, 16916.
 
 
 Version 2.17
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/eventfd.h b/sysdeps/unix/sysv/linux/sparc/bits/eventfd.h
index d76ac5f713..05da814bfd 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/eventfd.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/eventfd.h
@@ -22,6 +22,8 @@
 /* Flags for eventfd.  */
 enum
   {
+    EFD_SEMAPHORE = 0x000001,
+#define EFD_SEMAPHORE EFD_SEMAPHORE
     EFD_CLOEXEC = 0x400000,
 #define EFD_CLOEXEC EFD_CLOEXEC
     EFD_NONBLOCK = 0x004000