summaryrefslogtreecommitdiff
path: root/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-02-06 08:38:56 +0000
committerUlrich Drepper <drepper@redhat.com>2003-02-06 08:38:56 +0000
commit11090a992df365ac6b107027f2c932028172dcbf (patch)
tree55c0fbdd46957216487f59f5233901e7ccd5a8c6 /nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
parent432cf458f981cb1e9c9051cc39217fc7773f45dd (diff)
Update.
2003-02-06 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S: Remove wrong but inactive generalization. * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S: Likewise. * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S: Likewise. Minor optimization, remove one instruction. * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S: Likewise.
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S')
-rw-r--r--nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S7
1 files changed, 2 insertions, 5 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
index 7b8ec9328f..c520f287d9 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
@@ -51,9 +51,6 @@ __pthread_cond_timedwait:
movl 20(%esp), %ebx
movl 28(%esp), %ebp
-#if cond_lock != 0
- addl $cond_lock, %ebx
-#endif
/* Get internal lock. */
movl $1, %eax
@@ -134,10 +131,10 @@ __pthread_cond_timedwait:
leal 4(%esp), %esi
xorl %ecx, %ecx /* movl $FUTEX_WAIT, %ecx */
movl %edi, %edx
- addl $wakeup_seq-cond_lock, %ebx
+ addl $wakeup_seq, %ebx
movl $SYS_futex, %eax
ENTER_KERNEL
- subl $wakeup_seq-cond_lock, %ebx
+ subl $wakeup_seq, %ebx
movl %eax, %esi
call __pthread_disable_asynccancel