* sysdeps/unix/sysv/linux/x86_64/sysdep.h: Remove incorrect comment.

diff --git a/ChangeLog b/ChangeLog
index f1b6d3d..07fe6a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2007-02-09  Ulrich Drepper  <drepper@redhat.com>
 
+       * sysdeps/unix/sysv/linux/x86_64/sysdep.h: Remove incorrect comment.
+
        * resolv/res_init.c (res_setoptions): Recognize edns0 option.
        * resolv/res_mkquery.c: Define __res_nopt.
        * resolv/res_query.c (__libc_res_nquery): If RES_USE_EDNS0 is set

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 5b01cb2..1a47040 100644 (file)
--- 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 3783f1c..6724ded 100644 (file)
--- 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

diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep.h b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
index 3a0a632..1d9a68a 100644 (file)
--- a/sysdeps/unix/sysv/linux/x86_64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
@@ -182,7 +182,6 @@
     The Linux kernel uses and destroys internally these registers:
     return address from
     syscall            rcx
-    additionally clobered: r12-r15,rbx,rbp
     eflags from syscall        r11
 
     Normal function call, including calls to the system call stub