From: Jakub Jelinek Date: Thu, 12 Jul 2007 14:51:21 +0000 (+0000) Subject: 2007-02-09 Jakub Jelinek X-Git-Tag: cvs/fedora-glibc-2_5-20070712T1701~65 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56928ea4b99b2c9080b0a742f89ffd9a756bccfa;p=thirdparty%2Fglibc.git 2007-02-09 Jakub Jelinek * 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 0896ae93618..4d706da2c32 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,9 @@ +2007-02-09 Jakub Jelinek + + * 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 * 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 90f10e6f4fb..4497cadd40f 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