aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-03-10 19:37:46 +0000
committerUlrich Drepper <drepper@redhat.com>2003-03-10 19:37:46 +0000
commit4c3c2e8a6e1763ce01211399f63b1a1ce6b16a88 (patch)
tree974658a522c3dcdcb88133971a065822425463d2
parent8969b769c06c6baa295d6c15d4b28caf25660f57 (diff)
downloadglibc-4c3c2e8a6e1763ce01211399f63b1a1ce6b16a88.tar
glibc-4c3c2e8a6e1763ce01211399f63b1a1ce6b16a88.tar.gz
glibc-4c3c2e8a6e1763ce01211399f63b1a1ce6b16a88.tar.bz2
glibc-4c3c2e8a6e1763ce01211399f63b1a1ce6b16a88.zip
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.
-rw-r--r--nptl/ChangeLog5
-rw-r--r--nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 4c84cd50d3..da784502a9 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 9e627685da..f574cce7f6 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; })