picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix fallback path in __pthread_mutex_timedlock ().

Browse source 
Fix the typo in the fallback path in __pthread_mutex_timedlock ()
whic hcalls lll_futex_timed_wait ().  This is only useful for cases
where the patch is being backported to older distributions where
only lll_futex_timed_wait () is available.
This commit is contained in:
Carlos O'Donell 2018-06-12 16:17:05 -04:00
parent 48b12ed54c
commit 35df5a77f3
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2018-06-12 Carlos O'Donell <carlos@redhat.com>
* nptl/pthread_mutex_timedlock.c (__pthread_mutex_timedlock): Call
lll_futex_timed_wait.
2018-06-12 Joseph Myers <joseph@codesourcery.com>
[BZ #23277]

2
nptl/pthread_mutex_timedlock.c
View file

@ -287,7 +287,7 @@ __pthread_mutex_timedlock (pthread_mutex_t *mutex,
/* Block using the futex. */
#if (!defined __ASSUME_FUTEX_CLOCK_REALTIME \
|| !defined lll_futex_timed_wait_bitset)
lll_futex_timed wait (&mutex->__data.__lock, oldval,
lll_futex_timed_wait (&mutex->__data.__lock, oldval,
&rt, PTHREAD_ROBUST_MUTEX_PSHARED (mutex));
#else
int err = lll_futex_timed_wait_bitset (&mutex->__data.__lock,