From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 10 Mar 2003 19:37:46 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_3_3~1304
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c3c2e8a6e1763ce01211399f63b1a1ce6b16a88;p=thirdparty%2Fglibc.git

Update.

	* sysdeps/unix/sysv/linux/x86_64/lowlevellock.h (lll_trylock): Fix
	register loading.
	* sysdeps/unix/sysv/linux/i386/lowlevellock.h (lll_trylock): Undo
	last changed.  D'oh.
---

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 4c84cd50d3c..da784502a9b 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,10 @@
 2003-03-10  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/unix/sysv/linux/x86_64/lowlevellock.h (lll_trylock): Fix
+	register loading.
+	* sysdeps/unix/sysv/linux/i386/lowlevellock.h (lll_trylock): Undo
+	last changed.  D'oh.
+
 	* sysdeps/unix/sysv/linux/x86_64/lowlevellock.h: New file.
 
 	* sysdeps/unix/sysv/linux/i386/lowlevellock.h: Remove declaration
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
index 9e627685da5..f574cce7f65 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
@@ -142,7 +142,7 @@ extern int lll_unlock_wake_cb (int *__futex) attribute_hidden;
   ({ unsigned char ret;							      \
      __asm __volatile (LOCK_INSTR "cmpxchgl %2, %1; setne %0"		      \
 		       : "=a" (ret), "=m" (futex)			      \
-		       : "r" (0), "1" (futex), "0" (0)			      \
+		       : "r" (0), "1" (futex), "0" (1)			      \
 		       : "memory");					      \
      ret; })
 
@@ -188,7 +188,7 @@ extern int lll_unlock_wake_cb (int *__futex) attribute_hidden;
 		       "lock\n"						      \
 		       "0:\tcmpxchgl %2, %1; setne %0"			      \
 		       : "=a" (ret), "=m" (futex)			      \
-		       : "r" (0), "1" (futex), "0" (0)			      \
+		       : "r" (0), "1" (futex), "0" (1)			      \
 		       : "memory");					      \
      ret; })