From nobody Fri Jun 17 19:31:46 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9C32B852C87; Fri, 17 Jun 2022 19:31:47 +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 4LPq0z0dYFz3JyG; Fri, 17 Jun 2022 19:31:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EHlDqqBZ8wMUr5bp6+GetCzc4ieBjYwPSXlq+aK/AW8=; b=ov9/H8yCx/qf5GsqzoHZNEGHMteZa2GLNXNw4NgTrDNaU0hg3fcaHXiYI/bY6y0VtIPB2f yXUCknYcqL8C2wsrYfjA4qXcVQYqdcNdMLC39CZxPnLkFDtLizDi69JizB2jcvKr0V78Nv NFlPTclUQKCRhB1kcyvSxecdPpuezuzUcYrZevobtxGCkr8CTBhWAt7aANyHoukexFdaPH cD3dQu9PW2fFQiu6Tddcjz06jZHA9HAfWZTzK0awBcWmgu0rWUvdoieEvIQ33wTVrk86OS H79HAL20NHyPhch0sIu3r0UGviMjgJwpPHu7Z/NaqludbQpym4il52pIclJKJQ== 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 E5D4A25A1C; Fri, 17 Jun 2022 19:31:46 +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 25HJVktx007582; Fri, 17 Jun 2022 19:31:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJVkxC007581; Fri, 17 Jun 2022 19:31:46 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:31:46 GMT Message-Id: <202206171931.25HJVkxC007581@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: f348d6732b4c - stable/13 - linux(4): Change Linux futex syscall definition to match Linux actual one. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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/stable/13 X-Git-Reftype: branch X-Git-Commit: f348d6732b4cea849330178929f95190367b2bde Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EHlDqqBZ8wMUr5bp6+GetCzc4ieBjYwPSXlq+aK/AW8=; b=qYfm8cPVP+NyWj+JreRFb0/D8L5kSTmj4/klX3PL7sW0HbY5vo0ugpbAdji4ut2u68O97E ZexZjAxZznrvo/Cj3MRrw6Mck2TlnAKb4E2AhLBrNAtdQiZEGp8ClbAkxkRMQCLrB/5eqC M7jXPhJjI+GnKDL+mv2nDhP3Z4eVykdt3Gv/3fHqsXbTCAmc6tYLajLyDsEi5A3iAhU9TN qODSzZUMi7+wohfZHBqQsHl0TWW3eD/Q20ayTyS/nEX9zHQrXFNxdGTwjAZcqNDZ7U287X 04AGKCLcnF2zXlcpNK86ZLaEDKjrmqmuV+w2RtOVEKfbpP2YGX8fjVe1BaTNqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494307; a=rsa-sha256; cv=none; b=qwwfLFMgDCEUdyjG3YcLXvfcfVDqf4O5jCTVHycccF+ctbfZDEkWLNpAzK12fhRUGDZNFP JOx1xNezZo0lgTRjH81boJTZdlypYDyZJd/gfo3g7vlNwtYlwCZLYiySqioiHd8hk2Anq3 6bMb9KwJT8GRubr7JpO2nDlWqAySUppvSrQlTcR8Yf1p2Q84z4SjlJaIL1uj/kok8kgd42 HOD7OiZhLEhtiKKbIjKIKctX3VzInDtCfY26D5oIOAJCJKI3ZFb2+vpQ8MX6joGl8TOmWj Iqx2Ma2/WoZGdYjCdCGaNZIjcEdcFuXr/7WzAM17TsnzUoC0Pfpb46ELwRBKiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=f348d6732b4cea849330178929f95190367b2bde commit f348d6732b4cea849330178929f95190367b2bde Author: Dmitry Chagin AuthorDate: 2021-06-10 11:00:00 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:30:14 +0000 linux(4): Change Linux futex syscall definition to match Linux actual one. MFC after: 2 weeks (cherry picked from commit 3c1de151e365f05809264352b1d57125d792f373) --- 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 3d27ed496278..ca45e33d4190 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,