From d601c314c2163cbab6e7ea1d055a6386ce0d4c2c Mon Sep 17 00:00:00 2001 From: Kamil Rytarowski Date: Tue, 2 Jun 2020 20:01:29 +0200 Subject: [PATCH 2/5] Regenerate syscalls --- sys/kern/init_sysent.c | 2 +- sys/kern/syscalls.c | 2 +- sys/rump/include/rump/rump_syscalls.h | 7 ++++++- sys/rump/librump/rumpkern/rump_syscalls.c | 16 ++++++++-------- sys/rump/rump.sysmap | 2 +- sys/sys/syscall.h | 4 ++-- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 05cb878497f9..76d6407c64ca 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -2117,7 +2117,7 @@ struct sysent sysent[] = { ns(struct sys___pollts50_args), .sy_flags = SYCALL_ARG_PTR, .sy_call = (sy_call_t *)sys___pollts50 - }, /* 437 = __pollts50 */ + }, /* 437 = ppoll */ { ns(struct sys___aio_suspend50_args), .sy_flags = SYCALL_ARG_PTR, diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 092975f47a0a..5f639ad19d1c 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -483,7 +483,7 @@ const char *const syscallnames[] = { /* 434 */ "compat_60__lwp_park", /* 435 */ "__kevent50", /* 436 */ "__pselect50", - /* 437 */ "__pollts50", + /* 437 */ "ppoll", /* 438 */ "__aio_suspend50", /* 439 */ "__stat50", /* 440 */ "__fstat50", diff --git a/sys/rump/include/rump/rump_syscalls.h b/sys/rump/include/rump/rump_syscalls.h index 0e400457d84b..af4702cc0fb7 100644 --- a/sys/rump/include/rump/rump_syscalls.h +++ b/sys/rump/include/rump/rump_syscalls.h @@ -305,7 +305,11 @@ #endif #ifndef RUMP_SYS_RENAME_POLLTS -#define RUMP_SYS_RENAME_POLLTS rump___sysimpl_pollts50 +#define RUMP_SYS_RENAME_POLLTS rump___sysimpl_pollts +#endif + +#ifndef RUMP_SYS_RENAME_PPOLL +#define RUMP_SYS_RENAME_PPOLL rump___sysimpl_ppoll #endif #ifndef RUMP_SYS_RENAME_OPEN @@ -1034,6 +1038,7 @@ int rump_sys_clock_gettime(clockid_t, struct timespec *) __RENAME(RUMP_SYS_RENAM int rump_sys_clock_settime(clockid_t, const struct timespec *) __RENAME(RUMP_SYS_RENAME_CLOCK_SETTIME); int rump_sys_clock_getres(clockid_t, struct timespec *) __RENAME(RUMP_SYS_RENAME_CLOCK_GETRES); int rump_sys_nanosleep(const struct timespec *, struct timespec *) __RENAME(RUMP_SYS_RENAME_NANOSLEEP); +int rump_sys_ppoll(struct pollfd *, u_int, const struct timespec *, const sigset_t *) __RENAME(RUMP_SYS_RENAME_PPOLL); int rump_sys_aio_suspend(const struct aiocb *const *, int, const struct timespec *) __RENAME(RUMP_SYS_RENAME_AIO_SUSPEND); int rump_sys_timer_settime(timer_t, int, const struct itimerspec *, struct itimerspec *) __RENAME(RUMP_SYS_RENAME_TIMER_SETTIME); int rump_sys_timer_gettime(timer_t, struct itimerspec *) __RENAME(RUMP_SYS_RENAME_TIMER_GETTIME); diff --git a/sys/rump/librump/rumpkern/rump_syscalls.c b/sys/rump/librump/rumpkern/rump_syscalls.c index d34a650a76e3..1b48b3651dc5 100644 --- a/sys/rump/librump/rumpkern/rump_syscalls.c +++ b/sys/rump/librump/rumpkern/rump_syscalls.c @@ -5363,9 +5363,9 @@ __weak_alias(___pselect50,rump___sysimpl_pselect50); __strong_alias(_sys___pselect50,rump___sysimpl_pselect50); #endif /* RUMP_KERNEL_IS_LIBC */ -int rump___sysimpl_pollts50(struct pollfd *, u_int, const struct timespec *, const sigset_t *); +int rump___sysimpl_ppoll(struct pollfd *, u_int, const struct timespec *, const sigset_t *); int -rump___sysimpl_pollts50(struct pollfd * fds, u_int nfds, const struct timespec * ts, const sigset_t * mask) +rump___sysimpl_ppoll(struct pollfd * fds, u_int nfds, const struct timespec * ts, const sigset_t * mask) { register_t retval[2]; int error = 0; @@ -5378,7 +5378,7 @@ rump___sysimpl_pollts50(struct pollfd * fds, u_int nfds, const struct timespec * SPARG(&callarg, ts) = ts; SPARG(&callarg, mask) = mask; - error = rsys_syscall(SYS___pollts50, &callarg, sizeof(callarg), retval); + error = rsys_syscall(SYS_ppoll, &callarg, sizeof(callarg), retval); rsys_seterrno(error); if (error == 0) { if (sizeof(int) > sizeof(register_t)) @@ -5389,10 +5389,10 @@ rump___sysimpl_pollts50(struct pollfd * fds, u_int nfds, const struct timespec * return rv; } #ifdef RUMP_KERNEL_IS_LIBC -__weak_alias(pollts,rump___sysimpl_pollts50); -__weak_alias(__pollts50,rump___sysimpl_pollts50); -__weak_alias(___pollts50,rump___sysimpl_pollts50); -__strong_alias(_sys___pollts50,rump___sysimpl_pollts50); +__weak_alias(pollts,rump___sysimpl_ppoll); +__weak_alias(ppoll,rump___sysimpl_ppoll); +__weak_alias(_ppoll,rump___sysimpl_ppoll); +__strong_alias(_sys_ppoll,rump___sysimpl_ppoll); #endif /* RUMP_KERNEL_IS_LIBC */ int rump___sysimpl_aio_suspend50(const struct aiocb *const *, int, const struct timespec *); @@ -8277,7 +8277,7 @@ struct sysent rump_sysent[] = { { ns(struct sys___pollts50_args), .sy_call = (sy_call_t *)(void *)rumpns_enosys, - }, /* 437 = __pollts50 */ + }, /* 437 = ppoll */ { ns(struct sys___aio_suspend50_args), .sy_call = (sy_call_t *)(void *)rumpns_sys_nomodule, diff --git a/sys/rump/rump.sysmap b/sys/rump/rump.sysmap index cab36af41af4..d86a5afa5433 100644 --- a/sys/rump/rump.sysmap +++ b/sys/rump/rump.sysmap @@ -179,7 +179,7 @@ 430 sys___nanosleep50 __nanosleep50 rump___sysimpl_nanosleep50 435 sys___kevent50 __kevent50 rump___sysimpl_kevent50 436 sys___pselect50 __pselect50 rump___sysimpl_pselect50 -437 sys___pollts50 __pollts50 rump___sysimpl_pollts50 +437 sys___pollts50 ppoll rump___sysimpl_ppoll 438 sys_nomodule __aio_suspend50 rump___sysimpl_aio_suspend50 439 sys___stat50 __stat50 rump___sysimpl_stat50 440 sys___fstat50 __fstat50 rump___sysimpl_fstat50 diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index b89046491a6c..a0281f53cdab 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -1198,8 +1198,8 @@ /* syscall: "__pselect50" ret: "int" args: "int" "fd_set *" "fd_set *" "fd_set *" "const struct timespec *" "const sigset_t *" */ #define SYS___pselect50 436 -/* syscall: "__pollts50" ret: "int" args: "struct pollfd *" "u_int" "const struct timespec *" "const sigset_t *" */ -#define SYS___pollts50 437 +/* syscall: "ppoll" ret: "int" args: "struct pollfd *" "u_int" "const struct timespec *" "const sigset_t *" */ +#define SYS_ppoll 437 /* syscall: "__aio_suspend50" ret: "int" args: "const struct aiocb *const *" "int" "const struct timespec *" */ #define SYS___aio_suspend50 438 -- 2.26.2