diff options
| author | Andreas Schwab <schwab@redhat.com> | 2009-07-29 13:41:25 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-07-29 13:41:25 +0200 |
| commit | ac285df609a4cdd7fe09949bfe0d650a82d9942f (patch) | |
| tree | 4735e2e6ddc539475f3820d4aea955206fc8c077 /nptl/sysdeps/unix/sysv | |
| parent | 6bdb5f22a0ee205c45d1f465a8b39179830a14cb (diff) | |
| parent | c97164f05ba8fa5d2ebf30f1c2de083bc1ead1e1 (diff) | |
Merge commit 'origin/release/2.10/master' into fedora/2.10/master
Diffstat (limited to 'nptl/sysdeps/unix/sysv')
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S index 056b72900a..7578c7ece0 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S @@ -60,7 +60,7 @@ # define LOAD_FUTEX_WAIT_ABS(reg) \ xorl $FUTEX_PRIVATE_FLAG, reg ; \ andl %gs:PRIVATE_FUTEX, reg ; \ - orl $FUTEX_WAIT | FUTEX_CLOCK_REALTIME, reg + orl $FUTEX_WAIT_BITSET | FUTEX_CLOCK_REALTIME, reg # define LOAD_FUTEX_WAKE(reg) \ xorl $FUTEX_PRIVATE_FLAG, reg ; \ andl %gs:PRIVATE_FUTEX, reg ; \ |