diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-02-10 00:10:39 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-02-10 00:10:39 +0000 |
| commit | 5ed61e0fd6177e6ef6054a15ca04d0f5e90851d8 (patch) | |
| tree | e7f2cffd58270538c3936f7fab4923201c38ce87 /nptl | |
| parent | 2bbb7d5b3c517956e95e5827037a76cbc39a20c8 (diff) | |
| download | glibc-5ed61e0fd6177e6ef6054a15ca04d0f5e90851d8.tar.gz glibc-5ed61e0fd6177e6ef6054a15ca04d0f5e90851d8.tar.xz glibc-5ed61e0fd6177e6ef6054a15ca04d0f5e90851d8.zip | |
* sysdeps/unix/sysv/linux/x86_64/sysdep.h: Remove incorrect comment. cvs/fedora-glibc-20070211T1607
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 5b01cb2ab6..1a47040a76 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 |