The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=e29ea22f7012bb94f5f427349aa4580539cf2b7c
commit e29ea22f7012bb94f5f427349aa4580539cf2b7c Author: Dmitry Chagin <[email protected]> AuthorDate: 2021-06-07 02:39:29 +0000 Commit: Dmitry Chagin <[email protected]> CommitDate: 2021-06-07 02:39:29 +0000 Regen for ('0f8dab45404f347752470579feccc6d2739b9570') Linux rt_sigtimedwait system call. MFC after: 2 weeks --- sys/amd64/linux/linux_proto.h | 2 +- sys/amd64/linux/linux_systrace_args.c | 4 ++-- sys/amd64/linux32/linux32_proto.h | 2 +- sys/amd64/linux32/linux32_systrace_args.c | 4 ++-- sys/arm/linux/linux_proto.h | 2 +- sys/arm/linux/linux_systrace_args.c | 4 ++-- sys/arm64/linux/linux_proto.h | 2 +- sys/arm64/linux/linux_systrace_args.c | 4 ++-- sys/i386/linux/linux_proto.h | 2 +- sys/i386/linux/linux_systrace_args.c | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sys/amd64/linux/linux_proto.h b/sys/amd64/linux/linux_proto.h index 5bd92a9ebf43..60e880d891e8 100644 --- a/sys/amd64/linux/linux_proto.h +++ b/sys/amd64/linux/linux_proto.h @@ -478,7 +478,7 @@ struct linux_rt_sigpending_args { struct linux_rt_sigtimedwait_args { char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; char ptr_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * ptr; char ptr_r_[PADR_(l_siginfo_t *)]; - char timeout_l_[PADL_(struct l_timeval *)]; struct l_timeval * timeout; char timeout_r_[PADR_(struct l_timeval *)]; + char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; }; struct linux_rt_sigqueueinfo_args { diff --git a/sys/amd64/linux/linux_systrace_args.c b/sys/amd64/linux/linux_systrace_args.c index da43328aad5a..d1f2f30f60e0 100644 --- a/sys/amd64/linux/linux_systrace_args.c +++ b/sys/amd64/linux/linux_systrace_args.c @@ -1070,7 +1070,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_rt_sigtimedwait_args *p = params; uarg[0] = (intptr_t)p->mask; /* l_sigset_t * */ uarg[1] = (intptr_t)p->ptr; /* l_siginfo_t * */ - uarg[2] = (intptr_t)p->timeout; /* struct l_timeval * */ + uarg[2] = (intptr_t)p->timeout; /* struct l_timespec * */ iarg[3] = p->sigsetsize; /* l_size_t */ *n_args = 4; break; @@ -4475,7 +4475,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland l_siginfo_t *"; break; case 2: - p = "userland struct l_timeval *"; + p = "userland struct l_timespec *"; break; case 3: p = "l_size_t"; diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index 53218980b3f4..d8ac24f8492b 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -558,7 +558,7 @@ struct linux_rt_sigpending_args { struct linux_rt_sigtimedwait_args { char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; char ptr_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * ptr; char ptr_r_[PADR_(l_siginfo_t *)]; - char timeout_l_[PADL_(struct l_timeval *)]; struct l_timeval * timeout; char timeout_r_[PADR_(struct l_timeval *)]; + char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; }; struct linux_rt_sigqueueinfo_args { diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index bb29f8d0d3a5..9eb9bfc15390 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -1207,7 +1207,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_rt_sigtimedwait_args *p = params; uarg[0] = (intptr_t)p->mask; /* l_sigset_t * */ uarg[1] = (intptr_t)p->ptr; /* l_siginfo_t * */ - uarg[2] = (intptr_t)p->timeout; /* struct l_timeval * */ + uarg[2] = (intptr_t)p->timeout; /* struct l_timespec * */ iarg[3] = p->sigsetsize; /* l_size_t */ *n_args = 4; break; @@ -5041,7 +5041,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland l_siginfo_t *"; break; case 2: - p = "userland struct l_timeval *"; + p = "userland struct l_timespec *"; break; case 3: p = "l_size_t"; diff --git a/sys/arm/linux/linux_proto.h b/sys/arm/linux/linux_proto.h index 71225320bea1..e458adb30a10 100644 --- a/sys/arm/linux/linux_proto.h +++ b/sys/arm/linux/linux_proto.h @@ -463,7 +463,7 @@ struct linux_rt_sigpending_args { struct linux_rt_sigtimedwait_args { char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; char ptr_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * ptr; char ptr_r_[PADR_(l_siginfo_t *)]; - char timeout_l_[PADL_(struct l_timeval *)]; struct l_timeval * timeout; char timeout_r_[PADR_(struct l_timeval *)]; + char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; }; struct linux_rt_sigqueueinfo_args { diff --git a/sys/arm/linux/linux_systrace_args.c b/sys/arm/linux/linux_systrace_args.c index 2d5a8d2a9a74..608d8c1ed238 100644 --- a/sys/arm/linux/linux_systrace_args.c +++ b/sys/arm/linux/linux_systrace_args.c @@ -1050,7 +1050,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_rt_sigtimedwait_args *p = params; uarg[0] = (intptr_t)p->mask; /* l_sigset_t * */ uarg[1] = (intptr_t)p->ptr; /* l_siginfo_t * */ - uarg[2] = (intptr_t)p->timeout; /* struct l_timeval * */ + uarg[2] = (intptr_t)p->timeout; /* struct l_timespec * */ iarg[3] = p->sigsetsize; /* l_size_t */ *n_args = 4; break; @@ -4117,7 +4117,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland l_siginfo_t *"; break; case 2: - p = "userland struct l_timeval *"; + p = "userland struct l_timespec *"; break; case 3: p = "l_size_t"; diff --git a/sys/arm64/linux/linux_proto.h b/sys/arm64/linux/linux_proto.h index 8953a9d71401..66d9cad8b442 100644 --- a/sys/arm64/linux/linux_proto.h +++ b/sys/arm64/linux/linux_proto.h @@ -572,7 +572,7 @@ struct linux_rt_sigpending_args { struct linux_rt_sigtimedwait_args { char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; char ptr_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * ptr; char ptr_r_[PADR_(l_siginfo_t *)]; - char timeout_l_[PADL_(struct l_timeval *)]; struct l_timeval * timeout; char timeout_r_[PADR_(struct l_timeval *)]; + char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; }; struct linux_rt_sigqueueinfo_args { diff --git a/sys/arm64/linux/linux_systrace_args.c b/sys/arm64/linux/linux_systrace_args.c index 7edf41dbcdc4..18b6201516e7 100644 --- a/sys/arm64/linux/linux_systrace_args.c +++ b/sys/arm64/linux/linux_systrace_args.c @@ -1083,7 +1083,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_rt_sigtimedwait_args *p = params; uarg[0] = (intptr_t)p->mask; /* l_sigset_t * */ uarg[1] = (intptr_t)p->ptr; /* l_siginfo_t * */ - uarg[2] = (intptr_t)p->timeout; /* struct l_timeval * */ + uarg[2] = (intptr_t)p->timeout; /* struct l_timespec * */ iarg[3] = p->sigsetsize; /* l_size_t */ *n_args = 4; break; @@ -4146,7 +4146,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland l_siginfo_t *"; break; case 2: - p = "userland struct l_timeval *"; + p = "userland struct l_timespec *"; break; case 3: p = "l_size_t"; diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index e6f992539dc3..1b3512c5b890 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -559,7 +559,7 @@ struct linux_rt_sigpending_args { struct linux_rt_sigtimedwait_args { char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; char ptr_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * ptr; char ptr_r_[PADR_(l_siginfo_t *)]; - char timeout_l_[PADL_(struct l_timeval *)]; struct l_timeval * timeout; char timeout_r_[PADR_(struct l_timeval *)]; + char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; }; struct linux_rt_sigqueueinfo_args { diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c index 390b99e94052..b8e07e3cc985 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -1250,7 +1250,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_rt_sigtimedwait_args *p = params; uarg[0] = (intptr_t)p->mask; /* l_sigset_t * */ uarg[1] = (intptr_t)p->ptr; /* l_siginfo_t * */ - uarg[2] = (intptr_t)p->timeout; /* struct l_timeval * */ + uarg[2] = (intptr_t)p->timeout; /* struct l_timespec * */ iarg[3] = p->sigsetsize; /* l_size_t */ *n_args = 4; break; @@ -5141,7 +5141,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland l_siginfo_t *"; break; case 2: - p = "userland struct l_timeval *"; + p = "userland struct l_timespec *"; break; case 3: p = "l_size_t"; _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main To unsubscribe, send any mail to "[email protected]"
