aboutsummaryrefslogtreecommitdiff
path: root/nptl/pthread_mutex_lock.c
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2020-11-23 10:13:42 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2020-11-25 10:43:18 -0300
commit878fe624d44b8f6489b2d0de9bfdc09290a719a7 (patch)
treef618891604fc8a95a0ba87b34e3114eebcc21186 /nptl/pthread_mutex_lock.c
parent5289cec4b8812ffe7998df81b74be8ef6e563b5f (diff)
downloadglibc-878fe624d44b8f6489b2d0de9bfdc09290a719a7.tar
glibc-878fe624d44b8f6489b2d0de9bfdc09290a719a7.tar.gz
glibc-878fe624d44b8f6489b2d0de9bfdc09290a719a7.tar.bz2
glibc-878fe624d44b8f6489b2d0de9bfdc09290a719a7.zip
nptl: Replace lll_futex_{timed_}wait by futex-internal.h
The idea is to make NPTL implementation to use on the functions provided by futex-internal.h. Checked on x86_64-linux-gnu and i686-linux-gnu. Reviewed-by: Lukasz Majewski <lukma@denx.de>
Diffstat (limited to 'nptl/pthread_mutex_lock.c')
-rw-r--r--nptl/pthread_mutex_lock.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/nptl/pthread_mutex_lock.c b/nptl/pthread_mutex_lock.c
index 1f137f6201..965c5a3f4a 100644
--- a/nptl/pthread_mutex_lock.c
+++ b/nptl/pthread_mutex_lock.c
@@ -307,8 +307,8 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex)
assume_other_futex_waiters |= FUTEX_WAITERS;
/* Block using the futex and reload current lock value. */
- lll_futex_wait (&mutex->__data.__lock, oldval,
- PTHREAD_ROBUST_MUTEX_PSHARED (mutex));
+ futex_wait ((unsigned int *) &mutex->__data.__lock, oldval,
+ PTHREAD_ROBUST_MUTEX_PSHARED (mutex));
oldval = mutex->__data.__lock;
}
@@ -568,8 +568,9 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex)
break;
if (oldval != ceilval)
- lll_futex_wait (&mutex->__data.__lock, ceilval | 2,
- PTHREAD_MUTEX_PSHARED (mutex));
+ futex_wait ((unsigned int * ) &mutex->__data.__lock,
+ ceilval | 2,
+ PTHREAD_MUTEX_PSHARED (mutex));
}
while (atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
ceilval | 2, ceilval)