(lll_unlock_wake_cb): Correct last patch. (__lll_timedwait_tid): Don't check abstime for NULL pointer.

This commit is contained in:
Ulrich Drepper 2003-03-18 00:50:30 +00:00
parent 001bea714d
commit f911cc4a74
2 changed files with 7 additions and 4 deletions

View File

@ -80,8 +80,11 @@ hidden_proto (__lll_timedlock_wait)
int
lll_unlock_wake_cb (int *futex)
{
if (__lll_add (futex, 1) + 1 != 0)
lll_futex_wake (futex, 1);
if (__lll_add (futex, -1) - 1 != 0)
{
*futex = 0;
lll_futex_wake (futex, 1);
}
return 0;
}
@ -93,7 +96,7 @@ __lll_timedwait_tid (int *tidp, const struct timespec *abstime)
{
int tid;
if (abstime == NULL || abstime->tv_nsec >= 1000000000)
if (abstime->tv_nsec >= 1000000000)
return EINVAL;
/* Repeat until thread terminated. */

View File

@ -226,7 +226,7 @@ extern int lll_unlock_wake_cb (int *__futex) attribute_hidden;
__asm __volatile ("cmpl $0, __libc_multiple_threads(%%rip)\n\t" \
"je 0f\n\t" \
"lock\n" \
"0:\incl %0\n\t" \
"0:\tincl %0\n\t" \
"jng 1f\n\t" \
".subsection 1\n" \
"1:\tleaq %0, %%rdi\n\t" \