diff mbox

[6/6,BZ,#11588] arm: Re-enable PI futex support for ARM kernels >= 3.14.3

Message ID OFA4C643C7.D8C1AF84-ON86257D0E.006C7938-86257D0E.00700860@ni.com
State Superseded
Headers show

Commit Message

Gratian Crisan July 7, 2014, 8:23 p.m. UTC
ARM linux kernels before 3.14.3 may or may not support
futex_atomic_cmpxchg_inatomic depending on the kernel configuration
(e.g. CONFIG_CPU_USE_DOMAINS && CONFIG_SMP configuration was not 
supported)

Starting with 3.14.3 the linux kernel unconditionally enables support for 
ARM,
and this re-enables the relevant __ASSUME_* macros.

Signed-off-by: Gratian Crisan <gratian.crisan@ni.com>

---
ChangeLog:

2014-07-07  Gratian Crisan  <gratian.crisan@ni.com>

        [BZ #11588]
        * sysdeps/unix/sysv/linux/arm/kernel-features.h
        [__LINUX_KERNEL_VERSION < 0x030E03] (__ASSUME_FUTEX_LOCK_PI): 
Undefine.
        [__LINUX_KERNEL_VERSION < 0x030E03] (__ASSUME_REQUEUE_PI): 
Likewise.
        [__LINUX_KERNEL_VERSION < 0x030E03] (__ASSUME_SET_ROBUST_LIST):
        Likewise.
---
 sysdeps/unix/sysv/linux/arm/kernel-features.h | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
diff mbox

Patch

diff --git a/sysdeps/unix/sysv/linux/arm/kernel-features.h 
b/sysdeps/unix/sysv/linux/arm/kernel-features.h
index e755741..dd50cbf 100644
--- a/sysdeps/unix/sysv/linux/arm/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/arm/kernel-features.h
@@ -32,11 +32,13 @@ 
 # define __ASSUME_SENDMMSG_SYSCALL     1
 #endif
 
-#include_next <kernel-features.h>
-
-/* The ARM kernel may or may not support
+/* The ARM kernel before 3.14.3 may or may not support
    futex_atomic_cmpxchg_inatomic, depending on kernel
    configuration.  */
-#undef __ASSUME_FUTEX_LOCK_PI
-#undef __ASSUME_REQUEUE_PI
-#undef __ASSUME_SET_ROBUST_LIST
+#if __LINUX_KERNEL_VERSION < 0x030E03
+# undef __ASSUME_FUTEX_LOCK_PI
+# undef __ASSUME_REQUEUE_PI
+# undef __ASSUME_SET_ROBUST_LIST
+#endif
+
+#include_next <kernel-features.h>