From nobody Fri Jun 17 19:39:53 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 05FE085C7C5; Fri, 17 Jun 2022 19:39:56 +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 4LPqBL5nlVz3h2R; Fri, 17 Jun 2022 19:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494795; 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=VCBM7Bc1QnAfTIUfJ8UfnQ4BQeRTFXubNgyHyUy+3O0=; b=rIEFk6zdBHFvaG6LfEGX5MuXr/tacGmmBdaaO0aTMpsaa+5NKRT8KhiAr/7Ijcrwg6plf+ FXguDjvt30Siv1fVcFML6ctAecW2S5sj8lMOw85bt25WL8OpZt46OBh+WUtNp+VME2jF6X 0g1eqarLRbDmKSDR7TBcvfKv9tPOhtYbXNw12L8z9vf61K15QjopzokzMBOPW0535wpyon HQi7SL4Bmi0dedVSN/t7kF509HPkFPuUAB9ShHi1TczbFHQfE0gkZsIoe6CYhgqfzTslrg Z+wP0+lkZCvoFfhZ8MH64PCX8lRR/c1xFqCq7NGr4GkSj91h7NDFEz5xnW10EQ== 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 D31ED25C9B; Fri, 17 Jun 2022 19:39:53 +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 25HJdrSc016618; Fri, 17 Jun 2022 19:39:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJdrwN016617; Fri, 17 Jun 2022 19:39:53 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:39:53 GMT Message-Id: <202206171939.25HJdrwN016617@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: 219681b57b50 - stable/13 - linux(4): Call semop directly. 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: 219681b57b509b50df1cfd730fd53a3e1907ca60 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494795; 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=VCBM7Bc1QnAfTIUfJ8UfnQ4BQeRTFXubNgyHyUy+3O0=; b=W+/UsrLEm7NwvEYzRXmlYvcGmmRslyOJH+iRWlukl2tJiy5cbaA4P5nZkGwGuO/uCH2rJ9 ughApzVjuEs/Cg/4RMnNMQWx3xBQucib6iJnfXyd5Y4Elv5ehwHKwdE/DS3XUs7xYQEDp1 IDBMGHGcLyrSI0eayp7y0TtjXxVJbv4D6K9+hslilGuij7HuXQdCXj86SbIqZYQDfEPOOv 0OkqqC+Xe8Av61WIrLjeafN7ggi+/kiLGDjrVyl+L99h6b4YImJvxBpukzLAW7yjXZ/GIX boRWIlsS7iz5Zbhf64r0Rqoaa1A8qUohLW6vktm0u/n9t7y5V4MbOf7UkiEOrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494795; a=rsa-sha256; cv=none; b=IMY/1piIXQ/EtGEuYcUpsVeBratAtkXPsB5ruQd3h6Vf8I4bETXUP0l0UA+oVITi4Sj4Fz J4JkdcVBxLzO7aCNuMaZLw7/tXQZpY9TUxn2LcqmHat0HNR+FegBQ4a7VKgC+C9mZRNjjA bqN4LAIg/G6jxew296FOHdwYNrndXAUr4WCLjtj0JgllPTCD7XzPXLfjDw3OEs8wuRa/7S G9gHeSL/WLBrB+tT0oJYURQl7sWx2yDykBqTrJeshs0+xv0O5jRvWI49d0gcjZq19Nwy4T hxDKVZMoP+ta4S+IurSXzPK59IO8VIqLaKyhr0wR0WKmjFF7qdp2RVTO1f2DhQ== 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=219681b57b509b50df1cfd730fd53a3e1907ca60 commit 219681b57b509b50df1cfd730fd53a3e1907ca60 Author: Dmitry Chagin AuthorDate: 2022-05-06 16:58:53 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:34:43 +0000 linux(4): Call semop directly. As the Linux semop syscall is not defined in i386, and as it is equal to the native semop syscall, call it directly. Fix semop definition to match Linux actual one - nsops is size_t type. MFC after: 2 weeks (cherry picked from commit f686092664ee6c2c287f77f716db4d72e451c780) --- sys/amd64/linux/syscalls.master | 8 ++++---- sys/arm64/linux/syscalls.master | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/amd64/linux/syscalls.master b/sys/amd64/linux/syscalls.master index 2c61a29a2a4e..9cb2a899d882 100644 --- a/sys/amd64/linux/syscalls.master +++ b/sys/amd64/linux/syscalls.master @@ -472,11 +472,11 @@ l_int semflg ); } -65 AUE_NULL STD { - int linux_semop( +65 AUE_NULL NOPROTO { + int semop( l_int semid, - struct l_sembuf *tsops, - l_uint nsops + struct sembuf *sops, + l_size_t nsops ); } 66 AUE_NULL STD { diff --git a/sys/arm64/linux/syscalls.master b/sys/arm64/linux/syscalls.master index 80271533527c..efdc98771e05 100644 --- a/sys/arm64/linux/syscalls.master +++ b/sys/arm64/linux/syscalls.master @@ -1137,11 +1137,11 @@ 192 AUE_NULL STD { int linux_semtimedop(void); } -193 AUE_NULL STD { - int linux_semop( +193 AUE_NULL NOPROTO { + int semop( l_int semid, - struct l_sembuf *tsops, - l_uint nsops + struct sembuf *sops, + l_size_t nsops ); } 194 AUE_NULL STD {