From 2b7ae1b27f011919dbd6e87bc76c6f76b66ab186 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 21 Feb 2013 15:20:27 -0800 Subject: [PATCH] Add priority inheritance futex support on sparc. * sysdeps/unix/sysv/linux/sparc/lowlevellock.h (FUTEX_WAIT_REQUEUE_PI): Define. (FUTEX_CMP_REQUEUE_PI): Likewise. (lll_futex_wait_requeue_pi): Likewise. (lll_futex_timed_wait_requeue_pi): Likewise. (lll_futex_cmp_requeue_pi): Likewise. --- nptl/ChangeLog | 9 +++++++ nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h | 30 +++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 5f591b0..2a67608 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,12 @@ +2013-02-21 David S. Miller + + * sysdeps/unix/sysv/linux/sparc/lowlevellock.h + (FUTEX_WAIT_REQUEUE_PI): Define. + (FUTEX_CMP_REQUEUE_PI): Likewise. + (lll_futex_wait_requeue_pi): Likewise. + (lll_futex_timed_wait_requeue_pi): Likewise. + (lll_futex_cmp_requeue_pi): Likewise. + 2013-02-21 Carlos O'Donell * sysdeps/unix/sysv/linux/fork.c: Fix comment typo. diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h index c88ec16..2d7d9f8 100644 --- a/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h +++ b/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h @@ -37,6 +37,8 @@ #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 @@ -157,6 +159,34 @@ extern void __cpu_relax (void); }) #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); \ + }) + static inline int __attribute__ ((always_inline)) __lll_trylock (int *futex) -- 2.7.4