Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 20 Aug 2023 07:37:52 GMT
From:      Dmitry Chagin <dchagin@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 4e5f2eb0b6cd - main - Regen for readv syscall
Message-ID:  <202308200737.37K7bqZq049947@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by dchagin:

URL: https://cgit.FreeBSD.org/src/commit/?id=4e5f2eb0b6cdab35893f18b6132874b5b031df96

commit 4e5f2eb0b6cdab35893f18b6132874b5b031df96
Author:     Dmitry Chagin <dchagin@FreeBSD.org>
AuthorDate: 2023-08-20 07:36:32 +0000
Commit:     Dmitry Chagin <dchagin@FreeBSD.org>
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";



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308200737.37K7bqZq049947>