The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=61f45f6733d7536c442d14b30b435cfa6cd2f7cc
commit 61f45f6733d7536c442d14b30b435cfa6cd2f7cc Author: Dmitry Chagin <[email protected]> AuthorDate: 2022-05-08 10:38:17 +0000 Commit: Dmitry Chagin <[email protected]> CommitDate: 2022-05-08 10:38:17 +0000 linux(4): Regen for ppoll_time64 syscall. MFC after: 2 weeks --- 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 321391b38f1f..70d40d5f5767 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -1584,7 +1584,7 @@ struct linux_pselect6_time64_args { struct linux_ppoll_time64_args { char fds_l_[PADL_(struct pollfd *)]; struct pollfd * fds; char fds_r_[PADR_(struct pollfd *)]; char nfds_l_[PADL_(uint32_t)]; uint32_t nfds; char nfds_r_[PADR_(uint32_t)]; - char tsp_l_[PADL_(struct l_timespec *)]; struct l_timespec * tsp; char tsp_r_[PADR_(struct l_timespec *)]; + char tsp_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * tsp; char tsp_r_[PADR_(struct l_timespec64 *)]; char sset_l_[PADL_(l_sigset_t *)]; l_sigset_t * sset; char sset_r_[PADR_(l_sigset_t *)]; char ssize_l_[PADL_(l_size_t)]; l_size_t ssize; char ssize_r_[PADR_(l_size_t)]; }; diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index 651210c519c1..0e0c4ca7f9f0 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -3068,7 +3068,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_ppoll_time64_args *p = params; uarg[a++] = (intptr_t)p->fds; /* struct pollfd * */ uarg[a++] = p->nfds; /* uint32_t */ - uarg[a++] = (intptr_t)p->tsp; /* struct l_timespec * */ + uarg[a++] = (intptr_t)p->tsp; /* struct l_timespec64 * */ uarg[a++] = (intptr_t)p->sset; /* l_sigset_t * */ iarg[a++] = p->ssize; /* l_size_t */ *n_args = 5; @@ -8274,7 +8274,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "uint32_t"; break; case 2: - p = "userland struct l_timespec *"; + p = "userland struct l_timespec64 *"; break; case 3: p = "userland l_sigset_t *";
