From 7913ba4d91b848ec4e5698c59d43198a3ef9215d Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 18 Sep 2007 19:57:24 +0000 Subject: Updated to fedora-glibc-20070918T1931 --- nptl/ChangeLog | 7 +++++++ nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'nptl') 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 + + * 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 . + 2007-08-21 Ulrich Drepper [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 -- cgit v1.2.3