* 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>.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 60e770b..5d11b6a 100644 (file)
--- 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 2c17dc0..e5e802d 100644 (file)
--- 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