Fix futex syscall parameter for x86 absolute timeout waits.

This affects only installations compiled for kernels older than 2.6.18.
(cherry picked from commit 1828530f09bcc321cfb84c27110bbce804605ec4)

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index f3bd32f5778eff561cf1b891c10e0468de37a3ef..d97efa0cd2628f6543123421fbcccd8fbdf1bc17 100644 (file)
--- 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-15  Ulrich Drepper  <drepper@redhat.com>
 
        * cancellation.c (__pthread_disable_asynccancel): Correct the bits

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
index 056b72900aace69b5e0ae4470680f352821b3639..7578c7ece049c6baa36b77bf83a8517aeb326836 100644 (file)
--- 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 ; \