The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=158b57295f068590a42c30997f5e9cebad137fb9
commit 158b57295f068590a42c30997f5e9cebad137fb9 Author: Dmitry Chagin <[email protected]> AuthorDate: 2023-08-17 19:57:17 +0000 Commit: Dmitry Chagin <[email protected]> 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";
