[commits] r3356 - in /fsf/trunk/libc/nptl: ChangeLog sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Mon Sep  3 00:03:45 2007
New Revision: 3356

Log:
Import glibc-mainline for 2007-09-03

Modified:
    fsf/trunk/libc/nptl/ChangeLog
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S

Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Mon Sep  3 00:03:45 2007
@@ -1,3 +1,10 @@
+2007-09-02  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* 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@xxxxxxxxx>.
+
 2007-08-21  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	[BZ #4938]

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S Mon Sep  3 00:03:45 2007
@@ -401,7 +401,7 @@
 #else
 	decl	cond_lock(%rdi)
 #endif
-	jne	13f
+	je	13f
 
 #if cond_lock != 0
 	addq	$cond_lock, %rdi