[COMMITTED] Fix fallback path in __pthread_mutex_timedlock ().

Message ID adf284ec-3baf-73fe-bf07-0aaa1070fb8e@redhat.com
State New
Headers show
Series
  • [COMMITTED] Fix fallback path in __pthread_mutex_timedlock ().
Related show

Commit Message

Carlos O'Donell June 12, 2018, 8:19 p.m.
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                      | 5 +++++
 nptl/pthread_mutex_timedlock.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

Patch

diff --git a/ChangeLog b/ChangeLog
index cb3edd3160..f3ba045896 100644
--- 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]
diff --git a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c
index 66efd3989f..28237b0e58 100644
--- a/nptl/pthread_mutex_timedlock.c
+++ b/nptl/pthread_mutex_timedlock.c
@@ -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,