about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2012-11-21 18:42:04 +0100
committerAndreas Schwab <schwab@linux-m68k.org>2012-11-21 22:59:20 +0100
commit5a22385ad1e45bc5ae98e1ae19f576f358b21731 (patch)
treeb1f06ff1b632bb01e05ece775e7bbffb9aa57e01
parenta451ee33afe03b8c16a0d166be380182b9587f59 (diff)
downloadglibc-5a22385ad1e45bc5ae98e1ae19f576f358b21731.tar.gz
glibc-5a22385ad1e45bc5ae98e1ae19f576f358b21731.tar.xz
glibc-5a22385ad1e45bc5ae98e1ae19f576f358b21731.zip
m68k: fix return value of lll_futex_timed_wait_bitset
-rw-r--r--ports/ChangeLog.m68k6
-rw-r--r--ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h2
2 files changed, 7 insertions, 1 deletions
diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index 2bcddc05c2..e169402391 100644
--- a/ports/ChangeLog.m68k
+++ b/ports/ChangeLog.m68k
@@ -1,3 +1,9 @@
+2012-11-21  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
+	(lll_futex_timed_wait_bitset): Remove use of
+	INTERNAL_SYSCALL_ERROR_P.
+
 2012-11-20  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* sysdeps/m68k/m680x0/fpu/s_atan.c (weak_aliasx): Remove
diff --git a/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h b/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
index 3f1aedd6f5..73fdaeaaa0 100644
--- a/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
+++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
@@ -97,7 +97,7 @@
 			      __lll_private_flag (__op, private),	      \
 			      (val), (timespec), NULL /* Unused.  */,	      \
 			      FUTEX_BITSET_MATCH_ANY);			      \
-    INTERNAL_SYSCALL_ERROR_P (__ret, __err) ? -__ret : __ret;		      \
+    __ret;								      \
   })
 
 #define lll_futex_wake(futexp, nr, private) \