]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
Fix fallback path in __pthread_mutex_timedlock ().
authorCarlos O'Donell <carlos@redhat.com>
Tue, 12 Jun 2018 20:17:05 +0000 (16:17 -0400)
committerCarlos O'Donell <carlos@redhat.com>
Tue, 12 Jun 2018 20:17:05 +0000 (16:17 -0400)
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.

ChangeLog
nptl/pthread_mutex_timedlock.c

index cb3edd3160307efe1faf2ebf4639cc8aa131497c..f3ba04589632c7739e16d411fd43bf50877c57da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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]
index 66efd3989f18831c79e12eb8085affe67ffc9dd9..28237b0e58cfcaf50268a335053ef038e3d81590 100644 (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,