aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/unix/sysv/linux/ia64/nptl/lowlevellock.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e3a9b4f..5f12906 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2014-07-03 Roland McGrath <roland@hack.frob.com>
+ * sysdeps/unix/sysv/linux/ia64/lowlevellock.h
+ (lll_futex_timed_wait_bitset): Fix syscall argument count.
+
* sysdeps/nptl/configure.ac (libc_cv_forced_unwind):
Use -Dinhibit_libc=1 for unwind.h check to prevent false failure
in a bare environment with no <stdlib.h> installed.
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/lowlevellock.h b/sysdeps/unix/sysv/linux/ia64/nptl/lowlevellock.h
index 0105972..9d32395 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/ia64/nptl/lowlevellock.h
@@ -95,7 +95,7 @@
({ \
int __op = FUTEX_WAIT_BITSET | (clockbit); \
\
- DO_INLINE_SYSCALL(futex, 4, (long) (ftx), \
+ DO_INLINE_SYSCALL(futex, 6, (long) (ftx), \
__lll_private_flag (__op, private), \
(int) (val), (long) (timespec), NULL /* Unused. */, \
FUTEX_BITSET_MATCH_ANY); \