The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=11cdffc60325580d55e0ab835429d3fda2cbc8fb
commit 11cdffc60325580d55e0ab835429d3fda2cbc8fb Author: Konstantin Belousov <[email protected]> AuthorDate: 2023-03-31 22:28:25 +0000 Commit: Konstantin Belousov <[email protected]> CommitDate: 2023-04-04 13:19:08 +0000 Regen --- sys/compat/freebsd32/freebsd32_syscall.h | 2 +- sys/compat/freebsd32/freebsd32_syscalls.c | 2 +- sys/compat/freebsd32/freebsd32_sysent.c | 2 +- sys/compat/freebsd32/freebsd32_systrace_args.c | 8 ++++---- sys/kern/init_sysent.c | 2 +- sys/kern/syscalls.c | 2 +- sys/kern/systrace_args.c | 8 ++++---- sys/sys/syscall.h | 2 +- sys/sys/syscall.mk | 2 +- sys/sys/sysproto.h | 6 +++--- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h index 604a41ad80ed..c8815aa0a67b 100644 --- a/sys/compat/freebsd32/freebsd32_syscall.h +++ b/sys/compat/freebsd32/freebsd32_syscall.h @@ -501,5 +501,5 @@ #define FREEBSD32_SYS_fspacectl 580 #define FREEBSD32_SYS_sched_getcpu 581 #define FREEBSD32_SYS_swapoff 582 -#define FREEBSD32_SYS_kqueue1 583 +#define FREEBSD32_SYS_kqueuex 583 #define FREEBSD32_SYS_MAXSYSCALL 584 diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c index 512cee44bfd8..67db3b5dffe9 100644 --- a/sys/compat/freebsd32/freebsd32_syscalls.c +++ b/sys/compat/freebsd32/freebsd32_syscalls.c @@ -589,5 +589,5 @@ const char *freebsd32_syscallnames[] = { "fspacectl", /* 580 = fspacectl */ "sched_getcpu", /* 581 = sched_getcpu */ "swapoff", /* 582 = swapoff */ - "kqueue1", /* 583 = kqueue1 */ + "kqueuex", /* 583 = kqueuex */ }; diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index 172138cc3d99..e3574d407336 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -645,5 +645,5 @@ struct sysent freebsd32_sysent[] = { { .sy_narg = AS(fspacectl_args), .sy_call = (sy_call_t *)sys_fspacectl, .sy_auevent = AUE_FSPACECTL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 580 = fspacectl */ { .sy_narg = 0, .sy_call = (sy_call_t *)sys_sched_getcpu, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 581 = sched_getcpu */ { .sy_narg = AS(swapoff_args), .sy_call = (sy_call_t *)sys_swapoff, .sy_auevent = AUE_SWAPOFF, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 582 = swapoff */ - { .sy_narg = AS(kqueue1_args), .sy_call = (sy_call_t *)sys_kqueue1, .sy_auevent = AUE_KQUEUE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 583 = kqueue1 */ + { .sy_narg = AS(kqueuex_args), .sy_call = (sy_call_t *)sys_kqueuex, .sy_auevent = AUE_KQUEUE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 583 = kqueuex */ }; diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index 0436fc807ea2..6de26d4f6ba4 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -3321,9 +3321,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 2; break; } - /* kqueue1 */ + /* kqueuex */ case 583: { - struct kqueue1_args *p = params; + struct kqueuex_args *p = params; uarg[a++] = p->flags; /* u_int */ *n_args = 1; break; @@ -8971,7 +8971,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; - /* kqueue1 */ + /* kqueuex */ case 583: switch (ndx) { case 0: @@ -10839,7 +10839,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; - /* kqueue1 */ + /* kqueuex */ case 583: if (ndx == 0 || ndx == 1) p = "int"; diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 6d0db175ecd2..b7709bbc9fcb 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -644,5 +644,5 @@ struct sysent sysent[] = { { .sy_narg = AS(fspacectl_args), .sy_call = (sy_call_t *)sys_fspacectl, .sy_auevent = AUE_FSPACECTL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 580 = fspacectl */ { .sy_narg = 0, .sy_call = (sy_call_t *)sys_sched_getcpu, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 581 = sched_getcpu */ { .sy_narg = AS(swapoff_args), .sy_call = (sy_call_t *)sys_swapoff, .sy_auevent = AUE_SWAPOFF, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 582 = swapoff */ - { .sy_narg = AS(kqueue1_args), .sy_call = (sy_call_t *)sys_kqueue1, .sy_auevent = AUE_KQUEUE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 583 = kqueue1 */ + { .sy_narg = AS(kqueuex_args), .sy_call = (sy_call_t *)sys_kqueuex, .sy_auevent = AUE_KQUEUE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 583 = kqueuex */ }; diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 88b6dfe2f602..bf6281ad38ae 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -589,5 +589,5 @@ const char *syscallnames[] = { "fspacectl", /* 580 = fspacectl */ "sched_getcpu", /* 581 = sched_getcpu */ "swapoff", /* 582 = swapoff */ - "kqueue1", /* 583 = kqueue1 */ + "kqueuex", /* 583 = kqueuex */ }; diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index a278632e1d79..47d8286af150 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -3417,9 +3417,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 2; break; } - /* kqueue1 */ + /* kqueuex */ case 583: { - struct kqueue1_args *p = params; + struct kqueuex_args *p = params; uarg[a++] = p->flags; /* u_int */ *n_args = 1; break; @@ -9141,7 +9141,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; - /* kqueue1 */ + /* kqueuex */ case 583: switch (ndx) { case 0: @@ -11104,7 +11104,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; - /* kqueue1 */ + /* kqueuex */ case 583: if (ndx == 0 || ndx == 1) p = "int"; diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 2378497a96c0..0e725febf183 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -520,5 +520,5 @@ #define SYS_fspacectl 580 #define SYS_sched_getcpu 581 #define SYS_swapoff 582 -#define SYS_kqueue1 583 +#define SYS_kqueuex 583 #define SYS_MAXSYSCALL 584 diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index 10093a5f4942..946f33dfa748 100644 --- a/sys/sys/syscall.mk +++ b/sys/sys/syscall.mk @@ -426,4 +426,4 @@ MIASM = \ fspacectl.o \ sched_getcpu.o \ swapoff.o \ - kqueue1.o + kqueuex.o diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index e3c7b473258a..5cb69f8d59d3 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -1855,7 +1855,7 @@ struct swapoff_args { char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)]; char flags_l_[PADL_(u_int)]; u_int flags; char flags_r_[PADR_(u_int)]; }; -struct kqueue1_args { +struct kqueuex_args { char flags_l_[PADL_(u_int)]; u_int flags; char flags_r_[PADR_(u_int)]; }; int sys_exit(struct thread *, struct exit_args *); @@ -2253,7 +2253,7 @@ int sys_aio_readv(struct thread *, struct aio_readv_args *); int sys_fspacectl(struct thread *, struct fspacectl_args *); int sys_sched_getcpu(struct thread *, struct sched_getcpu_args *); int sys_swapoff(struct thread *, struct swapoff_args *); -int sys_kqueue1(struct thread *, struct kqueue1_args *); +int sys_kqueuex(struct thread *, struct kqueuex_args *); #ifdef COMPAT_43 @@ -3223,7 +3223,7 @@ int freebsd13_swapoff(struct thread *, struct freebsd13_swapoff_args *); #define SYS_AUE_fspacectl AUE_FSPACECTL #define SYS_AUE_sched_getcpu AUE_NULL #define SYS_AUE_swapoff AUE_SWAPOFF -#define SYS_AUE_kqueue1 AUE_KQUEUE +#define SYS_AUE_kqueuex AUE_KQUEUE #undef PAD_ #undef PADL_
