diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-09-02 16:53:13 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-09-02 16:53:13 +0000 |
| commit | 221d9d8e76d5a151ca2fd1829c16a60c5eec8a8b (patch) | |
| tree | 2d3d95af214c178b1e4c9242a7be26e58dff8eed | |
| parent | de4d8563645b6bd6e8085a2e29b1f6e04bf7058c (diff) | |
* sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
(__pthread_cond_wait): Fix unlocking of internal lock after mutex
unlocking failed.
Patch by Luca Barbieri <luca.barbieri@gmail.com>.
| -rw-r--r-- | nptl/ChangeLog | 7 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 60e770b5cf..5d11b6ab7d 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,10 @@ +2007-09-02 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S + (__pthread_cond_wait): Fix unlocking of internal lock after mutex + unlocking failed. + Patch by Luca Barbieri <luca.barbieri@gmail.com>. + 2007-08-21 Ulrich Drepper <drepper@redhat.com> [BZ #4938] diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S index 2c17dc03a2..e5e802d531 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S @@ -401,7 +401,7 @@ __pthread_cond_wait: #else decl cond_lock(%rdi) #endif - jne 13f + je 13f #if cond_lock != 0 addq $cond_lock, %rdi |