Skip to content

Commit

Permalink
Fix pthread_cond_timedwait error handling on old kernels.
Browse files Browse the repository at this point in the history
  • Loading branch information
Ulrich Drepper committed Jul 23, 2009
1 parent b2509a1 commit f1adf1f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions nptl/ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2009-07-23 Ulrich Drepper <drepper@redhat.com>

* sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S: Fix error
path when not using absolute timeout futex.

2009-07-20 Ulrich Drepper <drepper@redhat.com>

* sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S: Minor
Expand Down
4 changes: 2 additions & 2 deletions nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -551,12 +551,12 @@ __pthread_cond_timedwait:
jne 53b

cmpq 24(%rsp), %r9
jbe 45b
jbe 15f

cmpq %rax, %r9
ja 39b

cmpq $-ETIMEDOUT, %r14
15: cmpq $-ETIMEDOUT, %r14
jne 8b

jmp 99b
Expand Down

0 comments on commit f1adf1f

Please sign in to comment.