Skip to content

Commit

Permalink
Fix x86 pthread_cond_signal() FUTEX_WAKE_OP fallback
Browse files Browse the repository at this point in the history
(cherry picked from commit 022f6b8)
  • Loading branch information
Dinakar Guniguntala authored and Andreas Schwab committed Dec 1, 2010
1 parent a5030ca commit c86e42c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
6 changes: 6 additions & 0 deletions nptl/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2010-08-10 Dinakar Guniguntala <dino@in.ibm.com>
Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>

* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S: If
FUTEX_WAKE_OP fails make sure to call FUTEX_WAKE instead.

2010-07-03 Ulrich Drepper <drepper@redhat.com>

* tst-abstime.c (do_test): Some more cleanups
Expand Down
3 changes: 1 addition & 2 deletions nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 2002,2003,2004,2005,2007,2009 Free Software Foundation, Inc.
/* Copyright (C) 2002-2005,2007,2009,2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
Expand Down Expand Up @@ -163,7 +163,6 @@ __pthread_cond_signal:
#endif
orl $FUTEX_WAKE, %ecx

xorl $(FUTEX_WAKE ^ FUTEX_WAKE_OP), %ecx
movl $SYS_futex, %eax
/* %edx should be 1 already from $FUTEX_WAKE_OP syscall.
movl $1, %edx */
Expand Down

0 comments on commit c86e42c

Please sign in to comment.