diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-02-11 16:21:43 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-02-11 16:21:43 +0000 |
| commit | 6c8cc2d3042d0585741452006c29cb21fbba39ea (patch) | |
| tree | 9050443fde19b762762681cb114b3ca55831a038 /nptl | |
| parent | ce28a8ab09cdd49890261d37b5b9280131d18014 (diff) | |
Updated to fedora-glibc-20070211T1607cvs/fedora-glibc-2_5_90-17
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 6 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 9ee7f8d47d..e78e57c5b9 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,9 @@ +2007-02-09 Jakub Jelinek <jakub@redhat.com> + + * sysdeps/unix/sysv/linux/x86_64/lowlevellock.S + (__lll_mutex_timedlock_wait): Use correct pointer when we don't + call into the kernel to delay. + 2007-01-18 Ulrich Drepper <drepper@redhat.com> * tst-initializers1.c: We want to test the initializers as seen diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S index 3783f1ccee..6724ded762 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S @@ -164,7 +164,7 @@ __lll_mutex_timedlock_wait: 8: /* NB: %edx == 2 */ xorl %eax, %eax LOCK - cmpxchgl %edx, (%rdi) + cmpxchgl %edx, (%r12) jnz 7f 6: addq $16, %rsp |