From owner-dev-commits-src-main@freebsd.org Thu Jun 10 11:29:58 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E7648649043; Thu, 10 Jun 2021 11:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G11wk5yNXz4Wbf; Thu, 10 Jun 2021 11:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B45606C25; Thu, 10 Jun 2021 11:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15ABTwMO080412; Thu, 10 Jun 2021 11:29:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15ABTwK3080411; Thu, 10 Jun 2021 11:29:58 GMT (envelope-from git) Date: Thu, 10 Jun 2021 11:29:58 GMT Message-Id: <202106101129.15ABTwK3080411@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 3c1de151e365 - main - linux(4): Change Linux futex syscall definition to match Linux actual one. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c1de151e365f05809264352b1d57125d792f373 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jun 2021 11:29:59 -0000 The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=3c1de151e365f05809264352b1d57125d792f373 commit 3c1de151e365f05809264352b1d57125d792f373 Author: Dmitry Chagin AuthorDate: 2021-06-10 11:00:00 +0000 Commit: Dmitry Chagin CommitDate: 2021-06-10 11:00:00 +0000 linux(4): Change Linux futex syscall definition to match Linux actual one. MFC after: 2 weeks --- sys/amd64/linux/syscalls.master | 8 ++++---- sys/amd64/linux32/syscalls.master | 4 ++-- sys/arm/linux/syscalls.master | 5 +++-- sys/arm64/linux/syscalls.master | 11 ++++++----- sys/i386/linux/syscalls.master | 4 ++-- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/sys/amd64/linux/syscalls.master b/sys/amd64/linux/syscalls.master index 51f9fe00eb7d..0cac26337ef1 100644 --- a/sys/amd64/linux/syscalls.master +++ b/sys/amd64/linux/syscalls.master @@ -1214,12 +1214,12 @@ } 202 AUE_NULL STD { int linux_sys_futex( - void *uaddr, + uint32_t *uaddr, l_int op, - l_int val, + uint32_t val, struct l_timespec *timeout, - void *uaddr2, - l_int val3 + uint32_t *uaddr2, + uint32_t val3 ); } 203 AUE_NULL STD { diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master index 79ee1f30a00d..03523f45ced6 100644 --- a/sys/amd64/linux32/syscalls.master +++ b/sys/amd64/linux32/syscalls.master @@ -1322,8 +1322,8 @@ } 240 AUE_NULL STD { int linux_sys_futex( - void *uaddr, - int op, + uint32_t *uaddr, + l_int op, uint32_t val, struct l_timespec *timeout, uint32_t *uaddr2, diff --git a/sys/arm/linux/syscalls.master b/sys/arm/linux/syscalls.master index d67f9c3b2069..42adc18bbe1e 100644 --- a/sys/arm/linux/syscalls.master +++ b/sys/arm/linux/syscalls.master @@ -1104,8 +1104,9 @@ ); } 240 AUE_NULL STD { - int linux_sys_futex(void *uaddr, - int op, + int linux_sys_futex( + uint32_t *uaddr, + l_int op, uint32_t val, struct l_timespec *timeout, uint32_t *uaddr2, diff --git a/sys/arm64/linux/syscalls.master b/sys/arm64/linux/syscalls.master index 202425581e8e..dcb43553e469 100644 --- a/sys/arm64/linux/syscalls.master +++ b/sys/arm64/linux/syscalls.master @@ -596,12 +596,13 @@ int linux_unshare(void); } 98 AUE_NULL STD { - int linux_sys_futex(void *uaddr, - int op, - int val, + int linux_sys_futex( + uint32_t *uaddr, + l_int op, + uint32_t val, struct l_timespec *timeout, - void *uaddr2, - int val3 + uint32_t *uaddr2, + uint32_t val3 ); } 99 AUE_NULL STD { diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master index aa6eb7c1c46f..a60129ccdaa9 100644 --- a/sys/i386/linux/syscalls.master +++ b/sys/i386/linux/syscalls.master @@ -1343,8 +1343,8 @@ } 240 AUE_NULL STD { int linux_sys_futex( - void *uaddr, - int op, + uint32_t *uaddr, + l_int op, uint32_t val, struct l_timespec *timeout, uint32_t *uaddr2,