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.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 0896ae9361898bda6b994ba7ea78cab2969a94ed..4d706da2c32d66e2fb8c68a9979c3366bd28d065 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.
+
 2006-12-28  David S. Miller  <davem@davemloft.net>
 
        * shlib-versions: Fix sparc64 linux target specification.

diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
index 90f10e6f4fbd8b62395b9eb679ebb29045d42507..4497cadd40fa63604eaf660bfc426539945f68c4 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