From nobody Thu Aug 17 19:58:37 2023 X-Original-To: dev-commits-src-main@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 4RRbRL5zL3z4q5Lx; Thu, 17 Aug 2023 19:58:38 +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 4RRbRK5z9cz4HPl; Thu, 17 Aug 2023 19:58:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692302317; 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=lDse4G+osD/YgzlSqP2eMVb2nWHJYNiUzm7oY+oY7Rk=; b=l89LPluyO9GDPELGJK7/44xlvqJpX/yIIkIaAAlda5qHwbezejFpYijqNQjWiNwiHFaUkE QD82B7zcZCA7iSGGy66JU2mOsF5F+iGTk3qErZg2/E8moh74Md46Wka5XJNqjV6kXVWGU1 9O/wLwMjesWTrbi5zO/UwwiluwllvcDEccPK4O2npnBu/mX2g4QV6lIhht4hNz+CZr/rMW 7BmC43ta6xAC+Q1O9BLxdHj4j8KbU0ceDZ7/sjLXlTfHbG/O/dgmeTeegjNHJUSqG+098Z DgMgX15JP0eg+k7OjJzQgwMymsB6q74p/tukqGPdAYatCvAUzlSpTMlvM6BuUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692302317; 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=lDse4G+osD/YgzlSqP2eMVb2nWHJYNiUzm7oY+oY7Rk=; b=MWn9a+EOHZLsVLYmtUfu9RxnNStGuITDMIJZIfEaXWKu6yxC8ciDx/HHbym8HwF1zO8JBO 2cwc1Juek9lEejajOORoUt/d42VcZ4ki338GEgM8WdiUmMIq3wFOxvz+cd81NO4+yLrNRg tTCf3eTtIupQLJr9spnxKFNSPC1wIdkDDAkI0uFxAMB0vCvWvRr+oMStSE4LXMhGXD0Lk4 jXSvyZgjX39BYRvRrGffKGeaIfjmquwCPiDypaDK/xQTRhLNdb0gFGgrP3s/etuQx7SRhU cBBIBz6zndCaxwfesebYz4/7sLoAK+DvKAIlqnPQXi0j9dD7qqXYSX45a+bZqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692302317; a=rsa-sha256; cv=none; b=VCy4tKlEXiU/1iYR5bQPuMUwWIGG9eAFp1RWo1T2ug7P30oVA8RKITTwCQMaiR/PauetRr vMJ9WBbFv35OYiXuwB9c3cin9fVA4Ro5nv7QcISz7jsg4pu0SefwvbvLD98Jfp0QeMtuS0 3kguKvOzl8kMus/IYa2oWjNCxPS7JQRYWqQViPnDPL9/Hd1EbECxOjBQxp+QrqveaSXd1S dq+xKgJiyeeONtnX+H/NvuSGpmhlouVFnWOo/WiPFt7xGw2DoGWsl0kwGCqfGfEa9i4RZf 231sv/ZEIgpnRIzeXcYnBKDEf5jb+OstScr9LIb98jq7WNSvxXdTT+TKJEA9uQ== 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 4RRbRK51jnzmTV; Thu, 17 Aug 2023 19:58:37 +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 37HJwb6X080329; Thu, 17 Aug 2023 19:58:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HJwb6E080326; Thu, 17 Aug 2023 19:58:37 GMT (envelope-from git) Date: Thu, 17 Aug 2023 19:58:37 GMT Message-Id: <202308171958.37HJwb6E080326@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: 158b57295f06 - main - linux(4): Regen for sendfile List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 158b57295f068590a42c30997f5e9cebad137fb9 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=158b57295f068590a42c30997f5e9cebad137fb9 commit 158b57295f068590a42c30997f5e9cebad137fb9 Author: Dmitry Chagin AuthorDate: 2023-08-17 19:57:17 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-17 19:57:17 +0000 linux(4): Regen for sendfile --- sys/amd64/linux32/linux32_proto.h | 2 +- sys/amd64/linux32/linux32_systrace_args.c | 4 ++-- sys/i386/linux/linux_proto.h | 2 +- sys/i386/linux/linux_systrace_args.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index 4085791419ae..e0d52b2675d6 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -612,7 +612,7 @@ struct linux_sigaltstack_args { struct linux_sendfile_args { char out_l_[PADL_(l_int)]; l_int out; char out_r_[PADR_(l_int)]; char in_l_[PADL_(l_int)]; l_int in; char in_r_[PADR_(l_int)]; - char offset_l_[PADL_(l_long *)]; l_long * offset; char offset_r_[PADR_(l_long *)]; + char offset_l_[PADL_(l_off_t *)]; l_off_t * offset; char offset_r_[PADR_(l_off_t *)]; char count_l_[PADL_(l_size_t)]; l_size_t count; char count_r_[PADR_(l_size_t)]; }; struct linux_vfork_args { diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index 80940f5428d3..ba1c2c01852c 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -1297,7 +1297,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_sendfile_args *p = params; iarg[a++] = p->out; /* l_int */ iarg[a++] = p->in; /* l_int */ - uarg[a++] = (intptr_t)p->offset; /* l_long * */ + uarg[a++] = (intptr_t)p->offset; /* l_off_t * */ iarg[a++] = p->count; /* l_size_t */ *n_args = 4; break; @@ -5287,7 +5287,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "l_int"; break; case 2: - p = "userland l_long *"; + p = "userland l_off_t *"; break; case 3: p = "l_size_t"; diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index ecd5f4cb3e75..5ed3630599c6 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -607,7 +607,7 @@ struct linux_sigaltstack_args { struct linux_sendfile_args { char out_l_[PADL_(l_int)]; l_int out; char out_r_[PADR_(l_int)]; char in_l_[PADL_(l_int)]; l_int in; char in_r_[PADR_(l_int)]; - char offset_l_[PADL_(l_long *)]; l_long * offset; char offset_r_[PADR_(l_long *)]; + char offset_l_[PADL_(l_off_t *)]; l_off_t * offset; char offset_r_[PADR_(l_off_t *)]; char count_l_[PADL_(l_size_t)]; l_size_t count; char count_r_[PADR_(l_size_t)]; }; struct linux_vfork_args { diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c index 8121297a5fd8..20098469d72e 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -1330,7 +1330,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_sendfile_args *p = params; iarg[a++] = p->out; /* l_int */ iarg[a++] = p->in; /* l_int */ - uarg[a++] = (intptr_t)p->offset; /* l_long * */ + uarg[a++] = (intptr_t)p->offset; /* l_off_t * */ iarg[a++] = p->count; /* l_size_t */ *n_args = 4; break; @@ -5360,7 +5360,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "l_int"; break; case 2: - p = "userland l_long *"; + p = "userland l_off_t *"; break; case 3: p = "l_size_t";