Convert sparc over to lowlevellock-futex.h

	* sysdeps/unix/sysv/linux/sparc/lowlevellock.h: Make use of
	lowlevellock-futex.h

diff --git a/ChangeLog b/ChangeLog
index 344c575..215fd11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-16  David S. Miller  <davem@davemloft.net>
+
+       * sysdeps/unix/sysv/linux/sparc/lowlevellock.h: Make use of
+       lowlevellock-futex.h
+
 2015-04-16  Chris Metcalf  <cmetcalf@ezchip.com>
 
        * sysdeps/tile/configure.ac: New file.

diff --git a/sysdeps/unix/sysv/linux/sparc/lowlevellock.h b/sysdeps/unix/sysv/linux/sparc/lowlevellock.h
index db67ff9..9aefd9e 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/sparc/lowlevellock.h
@@ -25,158 +25,13 @@
 #include <atomic.h>
 #include <kernel-features.h>
 
-
-#define FUTEX_WAIT             0
-#define FUTEX_WAKE             1
-#define FUTEX_REQUEUE          3
-#define FUTEX_CMP_REQUEUE      4
-#define FUTEX_WAKE_OP          5
-#define FUTEX_OP_CLEAR_WAKE_IF_GT_ONE  ((4 << 24) | 1)
-#define FUTEX_LOCK_PI          6
-#define FUTEX_UNLOCK_PI                7
-#define FUTEX_TRYLOCK_PI       8
-#define FUTEX_WAIT_BITSET      9
-#define FUTEX_WAKE_BITSET      10
-#define FUTEX_WAIT_REQUEUE_PI   11
-#define FUTEX_CMP_REQUEUE_PI    12
-#define FUTEX_PRIVATE_FLAG     128
-#define FUTEX_CLOCK_REALTIME   256
-
-#define FUTEX_BITSET_MATCH_ANY 0xffffffff
-
-
-/* Values for 'private' parameter of locking macros.  Yes, the
-   definition seems to be backwards.  But it is not.  The bit will be
-   reversed before passing to the system call.  */
-#define LLL_PRIVATE    0
-#define LLL_SHARED     FUTEX_PRIVATE_FLAG
-
 #ifndef __sparc32_atomic_do_lock
 /* Delay in spinlock loop.  */
 extern void __cpu_relax (void);
 #define BUSY_WAIT_NOP  __cpu_relax ()
 #endif
 
-#if IS_IN (libc) || IS_IN (rtld)
-/* In libc.so or ld.so all futexes are private.  */
-# ifdef __ASSUME_PRIVATE_FUTEX
-#  define __lll_private_flag(fl, private) \
-  ((fl) | FUTEX_PRIVATE_FLAG)
-# else
-#  define __lll_private_flag(fl, private) \
-  ((fl) | THREAD_GETMEM (THREAD_SELF, header.private_futex))
-# endif
-#else
-# ifdef __ASSUME_PRIVATE_FUTEX
-#  define __lll_private_flag(fl, private) \
-  (((fl) | FUTEX_PRIVATE_FLAG) ^ (private))
-# else
-#  define __lll_private_flag(fl, private) \
-  (__builtin_constant_p (private)                                            \
-   ? ((private) == 0                                                         \
-      ? ((fl) | THREAD_GETMEM (THREAD_SELF, header.private_futex))           \
-      : (fl))                                                                \
-   : ((fl) | (((private) ^ FUTEX_PRIVATE_FLAG)                               \
-             & THREAD_GETMEM (THREAD_SELF, header.private_futex))))
-# endif
-#endif
-
-
-#define lll_futex_wait(futexp, val, private) \
-  lll_futex_timed_wait (futexp, val, NULL, private)
-
-#define lll_futex_timed_wait(futexp, val, timespec, private) \
-  ({                                                                         \
-    INTERNAL_SYSCALL_DECL (__err);                                           \
-    long int __ret;                                                          \
-                                                                             \
-    __ret = INTERNAL_SYSCALL (futex, __err, 4, (futexp),                     \
-                             __lll_private_flag (FUTEX_WAIT, private),       \
-                             (val), (timespec));                             \
-    __ret;                                                                   \
-  })
-
-#define lll_futex_timed_wait_bitset(futexp, val, timespec, clockbit, private) \
-  ({                                                                         \
-    INTERNAL_SYSCALL_DECL (__err);                                           \
-    long int __ret;                                                          \
-    int __op = FUTEX_WAIT_BITSET | clockbit;                                 \
-                                                                             \
-    __ret = INTERNAL_SYSCALL (futex, __err, 6, (futexp),                     \
-                             __lll_private_flag (__op, private),             \
-                             (val), (timespec), NULL /* Unused.  */,         \
-                             FUTEX_BITSET_MATCH_ANY);                        \
-    __ret;                                                                   \
-  })
-
-#define lll_futex_wake(futexp, nr, private) \
-  ({                                                                         \
-    INTERNAL_SYSCALL_DECL (__err);                                           \
-    long int __ret;                                                          \
-                                                                             \
-    __ret = INTERNAL_SYSCALL (futex, __err, 4, (futexp),                     \
-                             __lll_private_flag (FUTEX_WAKE, private),       \
-                             (nr), 0);                                       \
-    __ret;                                                                   \
-  })
-
-/* Returns non-zero if error happened, zero if success.  */
-#define lll_futex_requeue(futexp, nr_wake, nr_move, mutex, val, private) \
-  ({                                                                         \
-    INTERNAL_SYSCALL_DECL (__err);                                           \
-    long int __ret;                                                          \
-                                                                             \
-    __ret = INTERNAL_SYSCALL (futex, __err, 6, (futexp),                     \
-                             __lll_private_flag (FUTEX_CMP_REQUEUE, private),\
-                             (nr_wake), (nr_move), (mutex), (val));          \
-    INTERNAL_SYSCALL_ERROR_P (__ret, __err);                                 \
-  })
-
-/* Returns non-zero if error happened, zero if success.  */
-#ifdef __sparc32_atomic_do_lock
-/* Avoid FUTEX_WAKE_OP if supporting pre-v9 CPUs.  */
-# define lll_futex_wake_unlock(futexp, nr_wake, nr_wake2, futexp2, private) 1
-#else
-# define lll_futex_wake_unlock(futexp, nr_wake, nr_wake2, futexp2, private) \
-  ({                                                                         \
-    INTERNAL_SYSCALL_DECL (__err);                                           \
-    long int __ret;                                                          \
-                                                                             \
-    __ret = INTERNAL_SYSCALL (futex, __err, 6, (futexp),                     \
-                             __lll_private_flag (FUTEX_WAKE_OP, private),    \
-                             (nr_wake), (nr_wake2), (futexp2),               \
-                             FUTEX_OP_CLEAR_WAKE_IF_GT_ONE);                 \
-    INTERNAL_SYSCALL_ERROR_P (__ret, __err);                                 \
-  })
-#endif
-
-/* Priority Inheritance support.  */
-#define lll_futex_wait_requeue_pi(futexp, val, mutex, private) \
-  lll_futex_timed_wait_requeue_pi (futexp, val, NULL, 0, mutex, private)
-
-#define lll_futex_timed_wait_requeue_pi(futexp, val, timespec, clockbit,      \
-                                       mutex, private)                       \
-  ({                                                                         \
-    INTERNAL_SYSCALL_DECL (__err);                                           \
-    long int __ret;                                                          \
-    int __op = FUTEX_WAIT_REQUEUE_PI | clockbit;                             \
-                                                                             \
-    __ret = INTERNAL_SYSCALL (futex, __err, 5, (futexp),                     \
-                             __lll_private_flag (__op, private),             \
-                             (val), (timespec), mutex);                      \
-    INTERNAL_SYSCALL_ERROR_P (__ret, __err) ? -__ret : __ret;                \
-  })
-
-#define lll_futex_cmp_requeue_pi(futexp, nr_wake, nr_move, mutex, val, priv)  \
-  ({                                                                         \
-    INTERNAL_SYSCALL_DECL (__err);                                           \
-    long int __ret;                                                          \
-                                                                             \
-    __ret = INTERNAL_SYSCALL (futex, __err, 6, (futexp),                     \
-                             __lll_private_flag (FUTEX_CMP_REQUEUE_PI, priv),\
-                             (nr_wake), (nr_move), (mutex), (val));          \
-    INTERNAL_SYSCALL_ERROR_P (__ret, __err);                                 \
-  })
+#include <lowlevellock-futex.h>
 
 static inline int
 __attribute__ ((always_inline))