diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-09-18 19:57:24 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-09-18 19:57:24 +0000 |
| commit | 7913ba4d91b848ec4e5698c59d43198a3ef9215d (patch) | |
| tree | afc73f6e0376ae6d07526c5efa9e941641ce1f6d /nptl | |
| parent | cedf9b89dd3b436ff7fad4c75d3f288ee4cd4ecd (diff) | |
Updated to fedora-glibc-20070918T1931cvs/fedora-glibc-2_6_90-14
Diffstat (limited to 'nptl')
| -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 3fe3676ea5..d7cdd540a1 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 |