diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2004-10-01 21:37:29 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2004-10-01 21:37:29 +0000 |
| commit | 6d96590587deec027c04fe576f11cff0f445eb32 (patch) | |
| tree | a0b964a672b5e970d88a8f030da837ce14885aae /nptl | |
| parent | b7a09b9201b09b722209cb430813709505927be0 (diff) | |
| download | glibc-6d96590587deec027c04fe576f11cff0f445eb32.tar.gz glibc-6d96590587deec027c04fe576f11cff0f445eb32.tar.xz glibc-6d96590587deec027c04fe576f11cff0f445eb32.zip | |
Updated to fedora-glibc-20041001T2134 cvs/fedora-glibc-2_3_3-63
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 3 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index da7d842b36..90c7d5fb21 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,5 +1,8 @@ 2004-10-01 Ulrich Drepper <drepper@redhat.com> + * sysdeps/unix/sysv/linux/x86_64/lowlevellock.S + (__lll_mutex_timedlock_wait): Address futex correctly. + * sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S (__lll_mutex_timedlock_wait): I woken but cannot get the lock, make sure 2 is stored in the futex and we looked at the old value. diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S index 6827804f7f..d5c9345558 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S @@ -152,7 +152,7 @@ __lll_mutex_timedlock_wait: /* Make sure the current holder knows we are going to sleep. */ movl %edx, %eax - xchgl %eax, (%ebx) + xchgl %eax, (%rdi) testl %eax, %eax jz 6b jmp 1b |