From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 45DB43851C2E; Mon, 28 Sep 2020 13:07:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 45DB43851C2E Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] sysvipc: Fix semtimeop for !__ASSUME_DIRECT_SYSVIPC_SYSCALLS X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/master X-Git-Oldrev: 7424a0d009773bfdfeba4696d94da72706066546 X-Git-Newrev: aaa12e9ff02b32d5fbb2f367d7d6b6985a2176d6 Message-Id: <20200928130734.45DB43851C2E@sourceware.org> Date: Mon, 28 Sep 2020 13:07:34 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Sep 2020 13:07:34 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=aaa12e9ff02b32d5fbb2f367d7d6b6985a2176d6 commit aaa12e9ff02b32d5fbb2f367d7d6b6985a2176d6 Author: Adhemerval Zanella Date: Fri Sep 25 15:04:34 2020 -0300 sysvipc: Fix semtimeop for !__ASSUME_DIRECT_SYSVIPC_SYSCALLS The __NR_ipc syscall does not support 64-bit time operations. It fixes 7c437d3778. Checked on i686-linux-gnu on a Linux 5.4. Diff: --- sysdeps/unix/sysv/linux/semtimedop.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/sysdeps/unix/sysv/linux/semtimedop.c b/sysdeps/unix/sysv/linux/semtimedop.c index 56121fb0bf..a9ad922ee2 100644 --- a/sysdeps/unix/sysv/linux/semtimedop.c +++ b/sysdeps/unix/sysv/linux/semtimedop.c @@ -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)