From nobody Sun Aug 20 07:37:52 2023 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 4RT6sF1shSz4qrxh; Sun, 20 Aug 2023 07:37:53 +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 4RT6sF1GrFz3DWS; Sun, 20 Aug 2023 07:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517073; 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=Fa/ZnthrGA7W+QdsCGUAXG+VC8/fXDGqYbHJBvv6Tqs=; b=PD5KylAoEghE9/7uJrLC3Fd5eTd+NJ5n2XarioyfWvyZxW1Noo8IIKl5k0waYOXDCwi9+P Hmag48GmR0G/NxQ4eNLCF4jGxZqMtqtApIghpIjk4WWVsgnSdrPVAG3pCMbzFL/G//8rET 89+AOSlbXj9mBis6FSpcYCFHYZNrUbmfMFwowbzj16GpHei+ht5ZcFZrNPgNHRkhzFJvt+ uUQ8dB1ll7BWEgn74u2qWulPkUI+sizRUXkmW7BFBrKweI4YPpk8rGGXbpi6asUuEjN1b7 plGH0GUyyBcQZmGObRMkQvZKs6W4mehR0qfnaCLIMdbv3X08l6YYTXMlHK669g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692517073; 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=Fa/ZnthrGA7W+QdsCGUAXG+VC8/fXDGqYbHJBvv6Tqs=; b=ESdmPAPIPOclUoR1KKjsZLywp+ArZz+arVOewm8x/KYYYUqs2315CRnQ6mhWA00w6vYiCY 5dFKH8WLvkzSke5swrRSdppacv1wbKekotvQtjTvs7b5OKVz66IU0JMNnSZnZG84fiUMaU A0O9jO+3Ey6x7CJYpJRZ8y7SNZckUI1OcM5TDjLL/sBcji5GVuDyzeq8uVRCOXdpFHZKD0 Iw+p0E0oswB9yLVPCZBKgJllVC/V7g7p8sFvrRu3iwWibiTYUW1Of5Savl6/fV6v4xNVYO OCW/Q7y/69fWgh34GHj6lF51Gez9oaEZgNxM5zKXnQObp2YYSLsGZBvhdbkgog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692517073; a=rsa-sha256; cv=none; b=unHlFRi3a3g2QDk14oM5qc22N8HyB4/YVjpUsOwZ9cBugVkEwZlnuyg0u4HbCvxL4imv4L c2M2SnY/9wO7hlRnJPOWIS+LLwxbZ71CDOAeys//4wGI0UFvZOUfZVKnheDzsAEGba2jw2 fru67UVA+usJerdyjz0Cqu9iTCUYT4RnvDnQOoG7zc8TuKUImfh0Ds+Leb2k2hJVs/LFn6 Mb/C8Wa9dOpznRAd/IcLA9eJjIy31Vj+NimCcP8sq76u2VOFeTV/DRT2H06bbgqhGwzdTS G2A79RHaoycH65yJzSugXC6lH6+OlWwHCYEVgz2vzAH3WUPVHUeE/zPZW8+Esg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RT6sF04dvzWhn; Sun, 20 Aug 2023 07:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K7bqvQ049950; Sun, 20 Aug 2023 07:37:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K7bqZq049947; Sun, 20 Aug 2023 07:37:52 GMT (envelope-from git) Date: Sun, 20 Aug 2023 07:37:52 GMT Message-Id: <202308200737.37K7bqZq049947@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: 4e5f2eb0b6cd - main - Regen for readv syscall 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: 4e5f2eb0b6cdab35893f18b6132874b5b031df96 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=4e5f2eb0b6cdab35893f18b6132874b5b031df96 commit 4e5f2eb0b6cdab35893f18b6132874b5b031df96 Author: Dmitry Chagin AuthorDate: 2023-08-20 07:36:32 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-20 07:36:32 +0000 Regen for readv syscall --- sys/amd64/linux32/linux32_proto.h | 2 +- sys/amd64/linux32/linux32_systrace_args.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index bf599df05c22..8767199f2342 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -459,7 +459,7 @@ struct linux_msync_args { }; struct linux_readv_args { char fd_l_[PADL_(l_ulong)]; l_ulong fd; char fd_r_[PADR_(l_ulong)]; - char iovp_l_[PADL_(struct l_iovec32 *)]; struct l_iovec32 * iovp; char iovp_r_[PADR_(struct l_iovec32 *)]; + char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)]; char iovcnt_l_[PADL_(l_ulong)]; l_ulong iovcnt; char iovcnt_r_[PADR_(l_ulong)]; }; struct linux_writev_args { diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index ef00e9121233..de00b970027b 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -970,7 +970,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 145: { struct linux_readv_args *p = params; iarg[a++] = p->fd; /* l_ulong */ - uarg[a++] = (intptr_t)p->iovp; /* struct l_iovec32 * */ + uarg[a++] = (intptr_t)p->iovp; /* struct iovec32 * */ iarg[a++] = p->iovcnt; /* l_ulong */ *n_args = 3; break; @@ -4737,7 +4737,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "l_ulong"; break; case 1: - p = "userland struct l_iovec32 *"; + p = "userland struct iovec32 *"; break; case 2: p = "l_ulong";