From nobody Fri May 06 17:03:35 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 157391A825AA; Fri, 6 May 2022 17:03:36 +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 4KvxjM5P1tz4TQc; Fri, 6 May 2022 17:03:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651856615; 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=hpJSoBGtUAqHUBEAo0TAK4CeANF/Jdojc1z7B0rY63E=; b=wDRKKOJCFadKLQyrNTzzUH7gg33kcPigJ+LVroOgwgPdgPDhtit/VBIPe+zj76PFQ7vglL YeDiETRlUNF/aiMEZdYU42nTy0CCC8Uth208gFB/hgPb+ty+SvZEX/KVgaz8/4wZwzHWGk xubbNt+KjtOmtDjWysOWXZRS8Zk/3UkKAZuiAqbU/kZbZ9hW94rLK8vu3A5iiFBEh5oHt6 tvzuBY2WjQQyHoRQj8zq/iInr6YVkCvqQgadh+uLZZYxEft/Iz9tIBkAsSgZ3f/fz+i3K8 lt9QQK49vA9fF08wOsm9kkhbMTKv2jEAMNYL5jj1peyuotRqJmaOfc/3e5Y+Bw== 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 7CCB41F676; Fri, 6 May 2022 17:03:35 +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 246H3Z1i058867; Fri, 6 May 2022 17:03:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 246H3Zlb058866; Fri, 6 May 2022 17:03:35 GMT (envelope-from git) Date: Fri, 6 May 2022 17:03:35 GMT Message-Id: <202205061703.246H3Zlb058866@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: f686092664ee - main - 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/main X-Git-Reftype: branch X-Git-Commit: f686092664ee6c2c287f77f716db4d72e451c780 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651856615; 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=hpJSoBGtUAqHUBEAo0TAK4CeANF/Jdojc1z7B0rY63E=; b=Ua8Owc151Gayd/+fVktAyrQ+7LBQWhs1ga9uVl43ZgWxAHhUIrXi0tLAKQ2SwFcuYEAa5p xZBioNnumoDA8wZ5uVRD4d4bTmQnHbsis6HTNp3vQjkK07SfbxCfSy2GG76bfPAiAHC4Go qBhGoxrytEbGvD5HchMYeUmHC7DGGG1QpQyo39kF+oXep/EvNc9M2tVKiSpoC86JRhPXYy n0mEqfrcHkMvTHTwLshg+Ur+Wlt+2KzKzaHsC2o86tHFZQdeiohEz5UqHYkkoscipKdpKy 3a12OcdHZx0nMVzom3IJtHMjzt4j62pOX8KWqhORMgplLVWMjM9W/rvHdmgH6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651856615; a=rsa-sha256; cv=none; b=ttjUYsPZojDTfZczP1J/E4lZXUk1brJI+5ARXvjqLNzkgV/PvOH0cGvy0ctifU3ZJIk50O Lh7CwCLKnPP/8fSeFkrfOccsUMqa4WF+sJP8g8yDA71l7eetQzRIRGitHjydE58JvUZunQ bKR4GnFtL1sDLZpGMEOrkvuRLOp357fzmKym0lX04WHppmm4yGKpTbQmrQWwVVXKezqGv5 3R/R7I6M9d25Nn4BCYG4fPMxqLPm85G1hHGNfjXcujFP/WuZoHFSi2tSwyprBKj/YDncZx IcHy7Ce88+L+EBusD+0qCBijiHduAhs8O1wwEzJRzbfBXVMN5ajzFaz7LaK8fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=f686092664ee6c2c287f77f716db4d72e451c780 commit f686092664ee6c2c287f77f716db4d72e451c780 Author: Dmitry Chagin AuthorDate: 2022-05-06 16:58:53 +0000 Commit: Dmitry Chagin CommitDate: 2022-05-06 16:58:53 +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 --- 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 {