git: fe35736d0bb1 - stable/13 - linux(4): Regen for ppoll_time64 syscall.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 17 Jun 2022 19:40:01 UTC
The branch stable/13 has been updated by dchagin:
URL: https://cgit.FreeBSD.org/src/commit/?id=fe35736d0bb157977af4f5886d8383b5b95b6a66
commit fe35736d0bb157977af4f5886d8383b5b95b6a66
Author: Dmitry Chagin <dchagin@FreeBSD.org>
AuthorDate: 2022-06-17 19:34:58 +0000
Commit: Dmitry Chagin <dchagin@FreeBSD.org>
CommitDate: 2022-06-17 19:34:58 +0000
linux(4): Regen for ppoll_time64 syscall.
MFC after: 2 weeks
(cherry picked from commit 61f45f6733d7536c442d14b30b435cfa6cd2f7cc)
---
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 6d366ae9137b..a631088b7d23 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 009716bbc29f..a13b468ac296 100644
--- a/sys/amd64/linux32/linux32_systrace_args.c
+++ b/sys/amd64/linux32/linux32_systrace_args.c
@@ -3067,7 +3067,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
struct linux_ppoll_time64_args *p = params;
uarg[0] = (intptr_t)p->fds; /* struct pollfd * */
uarg[1] = p->nfds; /* uint32_t */
- uarg[2] = (intptr_t)p->tsp; /* struct l_timespec * */
+ uarg[2] = (intptr_t)p->tsp; /* struct l_timespec64 * */
uarg[3] = (intptr_t)p->sset; /* l_sigset_t * */
iarg[4] = p->ssize; /* l_size_t */
*n_args = 5;
@@ -8273,7 +8273,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 *";