]> sourceware.org Git - glibc.git/commitdiff
sysvipc: Fix semtimeop for !__ASSUME_DIRECT_SYSVIPC_SYSCALLS
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>
Fri, 25 Sep 2020 18:04:34 +0000 (15:04 -0300)
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>
Mon, 28 Sep 2020 13:03:04 +0000 (10:03 -0300)
The __NR_ipc syscall does not support 64-bit time operations.  It
fixes 7c437d3778.

Checked on i686-linux-gnu on a Linux 5.4.

sysdeps/unix/sysv/linux/semtimedop.c

index 56121fb0bf779ab8f6325e7ed62a0f5c04173728..a9ad922ee23b0750d6c2d74ece7b6e52af30d175 100644 (file)
@@ -26,16 +26,11 @@ int
 __semtimedop64 (int semid, struct sembuf *sops, size_t nsops,
                const struct __timespec64 *timeout)
 {
-#if defined __ASSUME_DIRECT_SYSVIPC_SYSCALLS
-# ifndef __NR_semtimedop_time64
-#  define __NR_semtimedop_time64 __NR_semtimedop
-# endif
+#ifndef __NR_semtimedop_time64
+# define __NR_semtimedop_time64 __NR_semtimedop
+#endif
   int r = INLINE_SYSCALL_CALL (semtimedop_time64, semid, sops, nsops,
                               timeout);
-#else
-  int r = INLINE_SYSCALL_CALL (ipc, IPCOP_semtimedop, semid,
-                              SEMTIMEDOP_IPC_ARGS (nsops, sops, timeout));
-#endif
 
 #ifndef __ASSUME_TIME64_SYSCALLS
   if (r == 0 || errno != ENOSYS)
This page took 0.046445 seconds and 5 git commands to generate.