From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) by sourceware.org (Postfix) with ESMTPS id 12D08386180E for ; Mon, 28 Sep 2020 13:08:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 12D08386180E Received: by mail-qk1-x733.google.com with SMTP id v123so819222qkd.9 for ; Mon, 28 Sep 2020 06:08:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=5ELvXunVtbnpW7PSON35pATyCwlJbGiQQTy/u1DPd5g=; b=QM6oN46YWWLCLM8b8r0DVgQM//06fs9iaWLGDMGwXMvsmE9e0iH5rzUKjARX3+Xh3g DDCNGz9/btZYSH+h6gkJcpyjMuW50iGxAE/Lcc38GAzLgdQ3AzXHG82wpM3zLuGJX9ST nLRJLJmPCiDBVJkPzZDubf1eqZXUrk5qBplF60wvxzq3QBauh2HAvPRRy1u1gjGtFltV lqtMTHLmeAOhFx722ZN/VGjnVhRZ+e0ojye0qLET5dhU7ksVpM6HaJ2Y7AA2WeivmXVw aXH0fcCcck6XhPod4AruVK9ckxsb2AJNQkJvBw/B5vAv24zgu19CljogLcKs+dvuzTQz 2WrQ== X-Gm-Message-State: AOAM5339AO9GSLmbBiZ9xB0xH6xVwF17t5Tlv0mXEgN0OkxH8MAROW2N CoXHtK+h63/7FNqrmYEBnk8GIiqeDfrY0A== X-Google-Smtp-Source: ABdhPJxLebWgu/iF9Fs9/Y1VnJ3ki8tRKjCUIKXlM9w/zhT4rQZiIqqu+8alXydZodWzRDzjUFG7rg== X-Received: by 2002:ae9:f301:: with SMTP id p1mr1311487qkg.216.1601298482085; Mon, 28 Sep 2020 06:08:02 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id 5sm889959qkj.135.2020.09.28.06.08.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 06:08:01 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [COMMITTED] sysvipc: Fix semtimeop for !__ASSUME_DIRECT_SYSVIPC_SYSCALLS Date: Mon, 28 Sep 2020 10:07:56 -0300 Message-Id: <20200928130756.85131-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Sep 2020 13:08:04 -0000 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 | 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) -- 2.25.1