diff options
| author | Bryan Kadzban <bz-glibc@kdzbn.homelinux.net> | 2009-06-11 11:32:51 -0700 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2009-06-11 11:32:51 -0700 |
| commit | 1828530f09bcc321cfb84c27110bbce804605ec4 (patch) | |
| tree | b22835a9238ec393fe2db569f5ef93716e95e56c | |
| parent | 310647e9809986986650994d036af18ca9b17fb2 (diff) | |
| download | glibc-1828530f09bcc321cfb84c27110bbce804605ec4.tar glibc-1828530f09bcc321cfb84c27110bbce804605ec4.tar.gz glibc-1828530f09bcc321cfb84c27110bbce804605ec4.tar.bz2 glibc-1828530f09bcc321cfb84c27110bbce804605ec4.zip | |
Fix futex syscall parameter for x86 absolute timeout waits.
This affects only installations compiled for kernels older than 2.6.18.
| -rw-r--r-- | nptl/ChangeLog | 8 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index d83b46125c..34a5f9112e 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,11 @@ +2009-06-11 Ulrich Drepper <drepper@redhat.com> + + [BZ #10262] + * sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S + (LOAD_FUTEX_WAIT_ABS): Fix futex parameter in case private futexes + cannot be assumed. + Patch by Bryan Kadzban <bz-glibc@kdzbn.homelinux.net>. + 2009-05-16 Ulrich Drepper <drepper@redhat.com> * libc-cancellation.c: Move __libc_cleanup_routine to... 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 ; \ |