From: Ulrich Drepper Date: Wed, 30 May 2007 04:22:24 +0000 (+0000) Subject: * sysdeps/unix/sysv/linux/x86_64/lowlevellock.S X-Git-Tag: cvs/glibc-2_6_1~52 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc3f0ccb9884844acc1b15673dc17a190e0a2262;p=thirdparty%2Fglibc.git * sysdeps/unix/sysv/linux/x86_64/lowlevellock.S (__lll_mutex_unlock_wake): Add back label '1' which went AWOL quite some time ago. --- diff --git a/nptl/ChangeLog b/nptl/ChangeLog index b757f48df53..285c3793f83 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,5 +1,9 @@ 2007-05-29 Ulrich Drepper + * sysdeps/unix/sysv/linux/x86_64/lowlevellock.S + (__lll_mutex_unlock_wake): Add back label '1' which went AWOL quite + some time ago. + * sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S: Checking whether there are more than one thread makes no sense here since we only call the slow path if the locks are taken. diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S index de70b1852ce..b92fa5c895b 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S @@ -253,7 +253,8 @@ __lll_mutex_unlock_wake: cfi_offset(%rsi, -16) cfi_offset(%rdx, -24) - movl $0, (%rdi) + /* NB: the label '1' is needed by lll_unlock_wake_cb. */ +1: movl $0, (%rdi) LOAD_FUTEX_WAKE (%esi) movl $1, %edx /* Wake one thread. */ movl $SYS_futex, %eax