diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2010-03-11 14:47:47 -0800 |
|---|---|---|
| committer | Fabrice Di Meglio <fdimeglio@google.com> | 2010-03-11 14:47:47 -0800 |
| commit | 8641833b62e3b319796dc80ea16eb1592c05edf6 (patch) | |
| tree | f0b9b778513da0e049ce1b4c706ae5000848d7c1 /libc/arch-arm | |
| parent | ba9c6f0989ae94778ba2b9f597adc827c9dc81e8 (diff) | |
| download | bionic-8641833b62e3b319796dc80ea16eb1592c05edf6.zip bionic-8641833b62e3b319796dc80ea16eb1592c05edf6.tar.gz bionic-8641833b62e3b319796dc80ea16eb1592c05edf6.tar.bz2 | |
Revert "bionic: pthread: use private futexes by default for mutexes and condvars"
This reverts commit ba9c6f0989ae94778ba2b9f597adc827c9dc81e8.
Diffstat (limited to 'libc/arch-arm')
| -rw-r--r-- | libc/arch-arm/bionic/atomics_arm.S | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/libc/arch-arm/bionic/atomics_arm.S b/libc/arch-arm/bionic/atomics_arm.S index 5076fe3..55c642f 100644 --- a/libc/arch-arm/bionic/atomics_arm.S +++ b/libc/arch-arm/bionic/atomics_arm.S @@ -43,19 +43,6 @@ #define FUTEX_WAIT 0 #define FUTEX_WAKE 1 -/* Private futexes belong to a single address space and cannot be - * shared among processes. They are however significantly faster to - * operate than standard futexes. - */ -.global __futex_wait_private -.type __futex_wait_private, %function -.global __futex_wake_private -.type __futex_wake_private, %function - -#define FUTEX_PRIVATE_FLAG 128 -#define FUTEX_WAIT_PRIVATE (FUTEX_WAIT|FUTEX_PRIVATE_FLAG) -#define FUTEX_WAKE_PRIVATE (FUTEX_WAKE|FUTEX_PRIVATE_FLAG) - #if 1 .equ kernel_cmpxchg, 0xFFFF0FC0 .equ kernel_atomic_base, 0xFFFF0FFF @@ -198,28 +185,6 @@ __futex_wake: ldmia sp!, {r4, r7} bx lr -__futex_wait_private: - .fnstart - stmdb sp!, {r4, r7} - .save {r4, r7} - mov r3, r2 - mov r2, r1 - mov r1, #FUTEX_WAIT_PRIVATE - ldr r7, =__NR_futex - swi #0 - ldmia sp!, {r4, r7} - bx lr - .fnend - -__futex_wake_private: - stmdb sp!, {r4, r7} - mov r2, r1 - mov r1, #FUTEX_WAKE_PRIVATE - ldr r7, =__NR_futex - swi #0 - ldmia sp!, {r4, r7} - bx lr - #else __futex_wait: @@ -235,17 +200,4 @@ __futex_wake: swi #__NR_futex bx lr -__futex_wait_private: - mov r3, r2 - mov r2, r1 - mov r1, #FUTEX_WAIT_PRIVATE - swi #__NR_futex - bx lr - -__futex_wake_private: - mov r2, r1 - mov r1, #FUTEX_WAKE_PRIVATE - swi #__NR_futex - bx lr - #endif |