Module Name: src Committed By: christos Date: Wed Oct 9 16:29:11 UTC 2024
Modified Files: src/sys/kern: init_sysent.c syscalls.c syscalls_autoload.c systrace_args.c src/sys/rump/include/rump: rump_syscalls.h src/sys/rump/librump/rumpkern: rump_syscalls.c src/sys/sys: syscall.h syscallargs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.345 -r1.346 src/sys/kern/init_sysent.c cvs rdiff -u -r1.333 -r1.334 src/sys/kern/syscalls.c cvs rdiff -u -r1.49 -r1.50 src/sys/kern/syscalls_autoload.c cvs rdiff -u -r1.55 -r1.56 src/sys/kern/systrace_args.c cvs rdiff -u -r1.132 -r1.133 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.163 -r1.164 src/sys/rump/librump/rumpkern/rump_syscalls.c cvs rdiff -u -r1.328 -r1.329 src/sys/sys/syscall.h cvs rdiff -u -r1.311 -r1.312 src/sys/sys/syscallargs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/kern/init_sysent.c diff -u src/sys/kern/init_sysent.c:1.345 src/sys/kern/init_sysent.c:1.346 --- src/sys/kern/init_sysent.c:1.345 Sat Oct 5 14:06:42 2024 +++ src/sys/kern/init_sysent.c Wed Oct 9 12:29:10 2024 @@ -1,14 +1,14 @@ -/* $NetBSD: init_sysent.c,v 1.345 2024/10/05 18:06:42 mlelstv Exp $ */ +/* $NetBSD: init_sysent.c,v 1.346 2024/10/09 16:29:10 christos Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.315 2024/10/05 18:04:53 mlelstv Exp + * created from NetBSD: syscalls.master,v 1.316 2024/10/09 16:27:28 christos Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.345 2024/10/05 18:06:42 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.346 2024/10/09 16:29:10 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_modular.h" @@ -2477,13 +2477,11 @@ struct sysent sysent[] = { ns(struct sys___dup3100_args), .sy_call = (sy_call_t *)sys___dup3100 }, /* 505 = __dup3100 */ -#if defined(SYSVSHM) || !defined(_KERNEL_OPT) { ns(struct sys_semtimedop_args), .sy_flags = SYCALL_ARG_PTR, - .sy_call = (sy_call_t *)sys_semtimedop + .sy_call = (sy_call_t *)sys_nomodule }, /* 506 = semtimedop */ -#endif { .sy_call = sys_nosys, }, /* 507 = filler */ @@ -2517,5 +2515,5 @@ const uint32_t sysent_nomodbits[] = { 0x007fe338, /* syscalls 384-415 */ 0x1c4f0040, /* syscalls 416-447 */ 0x00000040, /* syscalls 448-479 */ - 0x00000000, /* syscalls 480-511 */ + 0x04000000, /* syscalls 480-511 */ }; Index: src/sys/kern/syscalls.c diff -u src/sys/kern/syscalls.c:1.333 src/sys/kern/syscalls.c:1.334 --- src/sys/kern/syscalls.c:1.333 Sat Oct 5 14:06:42 2024 +++ src/sys/kern/syscalls.c Wed Oct 9 12:29:11 2024 @@ -1,14 +1,14 @@ -/* $NetBSD: syscalls.c,v 1.333 2024/10/05 18:06:42 mlelstv Exp $ */ +/* $NetBSD: syscalls.c,v 1.334 2024/10/09 16:29:11 christos Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.315 2024/10/05 18:04:53 mlelstv Exp + * created from NetBSD: syscalls.master,v 1.316 2024/10/09 16:27:28 christos Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.333 2024/10/05 18:06:42 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.334 2024/10/09 16:29:11 christos Exp $"); #if defined(_KERNEL_OPT) #ifdef _KERNEL_OPT @@ -556,9 +556,7 @@ const char *const syscallnames[] = { /* 503 */ "epoll_ctl", /* 504 */ "epoll_pwait2", /* 505 */ "__dup3100", -#if defined(SYSVSHM) || !defined(_KERNEL_OPT) /* 506 */ "semtimedop", -#endif /* 507 */ "# filler", /* 508 */ "# filler", /* 509 */ "# filler", @@ -1095,9 +1093,7 @@ const char *const altsyscallnames[] = { /* 503 */ NULL, /* epoll_ctl */ /* 504 */ NULL, /* epoll_pwait2 */ /* 505 */ "dup3", -#if defined(SYSVSHM) || !defined(_KERNEL_OPT) /* 506 */ NULL, /* semtimedop */ -#endif /* 507 */ NULL, /* filler */ /* 508 */ NULL, /* filler */ /* 509 */ NULL, /* filler */ Index: src/sys/kern/syscalls_autoload.c diff -u src/sys/kern/syscalls_autoload.c:1.49 src/sys/kern/syscalls_autoload.c:1.50 --- src/sys/kern/syscalls_autoload.c:1.49 Sat Oct 5 14:06:42 2024 +++ src/sys/kern/syscalls_autoload.c Wed Oct 9 12:29:11 2024 @@ -1,14 +1,14 @@ -/* $NetBSD: syscalls_autoload.c,v 1.49 2024/10/05 18:06:42 mlelstv Exp $ */ +/* $NetBSD: syscalls_autoload.c,v 1.50 2024/10/09 16:29:11 christos Exp $ */ /* * System call autoload table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.315 2024/10/05 18:04:53 mlelstv Exp + * created from NetBSD: syscalls.master,v 1.316 2024/10/09 16:27:28 christos Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.49 2024/10/05 18:06:42 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.50 2024/10/09 16:29:11 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_modular.h" @@ -209,7 +209,6 @@ static struct sc_autoload netbsd_syscall #else #endif { SYS_compat_100_dup3, "compat_100" }, -#if defined(SYSVSHM) || !defined(_KERNEL_OPT) -#endif + { SYS_semtimedop, "sysv_ipc" }, { 0, NULL } }; Index: src/sys/kern/systrace_args.c diff -u src/sys/kern/systrace_args.c:1.55 src/sys/kern/systrace_args.c:1.56 --- src/sys/kern/systrace_args.c:1.55 Sat Oct 5 14:06:42 2024 +++ src/sys/kern/systrace_args.c Wed Oct 9 12:29:11 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: systrace_args.c,v 1.55 2024/10/05 18:06:42 mlelstv Exp $ */ +/* $NetBSD: systrace_args.c,v 1.56 2024/10/09 16:29:11 christos Exp $ */ /* * System call argument to DTrace register array conversion. @@ -3944,7 +3944,6 @@ systrace_args(register_t sysnum, const v *n_args = 3; break; } -#if defined(SYSVSHM) || !defined(_KERNEL_OPT) /* sys_semtimedop */ case 506: { const struct sys_semtimedop_args *p = params; @@ -3955,7 +3954,6 @@ systrace_args(register_t sysnum, const v *n_args = 4; break; } -#endif default: *n_args = 0; break; @@ -10666,7 +10664,6 @@ systrace_entry_setargdesc(int sysnum, in break; }; break; -#if defined(SYSVSHM) || !defined(_KERNEL_OPT) /* sys_semtimedop */ case 506: switch(ndx) { @@ -10686,7 +10683,6 @@ systrace_entry_setargdesc(int sysnum, in break; }; break; -#endif default: break; }; @@ -12919,13 +12915,11 @@ systrace_return_setargdesc(int sysnum, i if (ndx == 0 || ndx == 1) p = "int"; break; -#if defined(SYSVSHM) || !defined(_KERNEL_OPT) /* sys_semtimedop */ case 506: if (ndx == 0 || ndx == 1) p = "int"; break; -#endif default: break; }; Index: src/sys/rump/include/rump/rump_syscalls.h diff -u src/sys/rump/include/rump/rump_syscalls.h:1.132 src/sys/rump/include/rump/rump_syscalls.h:1.133 --- src/sys/rump/include/rump/rump_syscalls.h:1.132 Sat Oct 5 14:06:42 2024 +++ src/sys/rump/include/rump/rump_syscalls.h Wed Oct 9 12:29:11 2024 @@ -1,10 +1,10 @@ -/* $NetBSD: rump_syscalls.h,v 1.132 2024/10/05 18:06:42 mlelstv Exp $ */ +/* $NetBSD: rump_syscalls.h,v 1.133 2024/10/09 16:29:11 christos Exp $ */ /* * System call protos in rump namespace. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.315 2024/10/05 18:04:53 mlelstv Exp + * created from NetBSD: syscalls.master,v 1.316 2024/10/09 16:27:28 christos Exp */ #ifndef _RUMP_RUMP_SYSCALLS_H_ Index: src/sys/rump/librump/rumpkern/rump_syscalls.c diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.163 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.164 --- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.163 Sat Oct 5 14:06:42 2024 +++ src/sys/rump/librump/rumpkern/rump_syscalls.c Wed Oct 9 12:29:11 2024 @@ -1,10 +1,10 @@ -/* $NetBSD: rump_syscalls.c,v 1.163 2024/10/05 18:06:42 mlelstv Exp $ */ +/* $NetBSD: rump_syscalls.c,v 1.164 2024/10/09 16:29:11 christos Exp $ */ /* * System call vector and marshalling for rump. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.315 2024/10/05 18:04:53 mlelstv Exp + * created from NetBSD: syscalls.master,v 1.316 2024/10/09 16:27:28 christos Exp */ #ifdef RUMP_CLIENT @@ -15,7 +15,7 @@ #ifdef __NetBSD__ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.163 2024/10/05 18:06:42 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.164 2024/10/09 16:29:11 christos Exp $"); #include <sys/fstypes.h> #include <sys/proc.h> @@ -8659,11 +8659,10 @@ struct sysent rump_sysent[] = { ns(struct sys___dup3100_args), .sy_call = (sy_call_t *)(void *)rumpns_enosys, }, /* 505 = __dup3100 */ -#if defined(SYSVSHM) || !defined(_KERNEL_OPT) { - .sy_call = (sy_call_t *)(void *)rumpns_enosys, + .sy_flags = SYCALL_NOSYS, + .sy_call = (sy_call_t *)(void *)rumpns_sys_nomodule, }, /* 506 = semtimedop */ -#endif { .sy_flags = SYCALL_NOSYS, .sy_call = (sy_call_t *)(void *)rumpns_enosys, @@ -8702,7 +8701,7 @@ const uint32_t rump_sysent_nomodbits[] = 0x007fe338, /* syscalls 384-415 */ 0x1c4f0040, /* syscalls 416-447 */ 0x00000040, /* syscalls 448-479 */ - 0x00000000, /* syscalls 480-511 */ + 0x04000000, /* syscalls 480-511 */ }; CTASSERT(__arraycount(rump_sysent) == SYS_NSYSENT); __strong_alias(rumpns_sysent,rump_sysent); Index: src/sys/sys/syscall.h diff -u src/sys/sys/syscall.h:1.328 src/sys/sys/syscall.h:1.329 --- src/sys/sys/syscall.h:1.328 Sat Oct 5 14:06:41 2024 +++ src/sys/sys/syscall.h Wed Oct 9 12:29:11 2024 @@ -1,10 +1,10 @@ -/* $NetBSD: syscall.h,v 1.328 2024/10/05 18:06:41 mlelstv Exp $ */ +/* $NetBSD: syscall.h,v 1.329 2024/10/09 16:29:11 christos Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.315 2024/10/05 18:04:53 mlelstv Exp + * created from NetBSD: syscalls.master,v 1.316 2024/10/09 16:27:28 christos Exp */ #ifndef _SYS_SYSCALL_H_ @@ -1422,11 +1422,9 @@ /* syscall: "__dup3100" ret: "int" args: "int" "int" "int" */ #define SYS___dup3100 505 -#if defined(SYSVSHM) || !defined(_KERNEL_OPT) /* syscall: "semtimedop" ret: "int" args: "int" "struct sembuf *" "size_t" "struct timespec *" */ #define SYS_semtimedop 506 -#endif #define SYS_MAXSYSCALL 507 #define SYS_NSYSENT 512 #endif /* _SYS_SYSCALL_H_ */ Index: src/sys/sys/syscallargs.h diff -u src/sys/sys/syscallargs.h:1.311 src/sys/sys/syscallargs.h:1.312 --- src/sys/sys/syscallargs.h:1.311 Sat Oct 5 14:06:41 2024 +++ src/sys/sys/syscallargs.h Wed Oct 9 12:29:11 2024 @@ -1,10 +1,10 @@ -/* $NetBSD: syscallargs.h,v 1.311 2024/10/05 18:06:41 mlelstv Exp $ */ +/* $NetBSD: syscallargs.h,v 1.312 2024/10/09 16:29:11 christos Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.315 2024/10/05 18:04:53 mlelstv Exp + * created from NetBSD: syscalls.master,v 1.316 2024/10/09 16:27:28 christos Exp */ #ifndef _SYS_SYSCALLARGS_H_ @@ -3408,7 +3408,6 @@ struct sys___dup3100_args { syscallarg(int) flags; }; check_syscall_args(sys___dup3100) -#if defined(SYSVSHM) || !defined(_KERNEL_OPT) #ifndef RUMP_CLIENT struct sys_semtimedop_args { @@ -3419,7 +3418,6 @@ struct sys_semtimedop_args { }; check_syscall_args(sys_semtimedop) #endif /* !RUMP_CLIENT */ -#endif /* * System call prototypes. @@ -4357,9 +4355,7 @@ int sys_epoll_pwait2(struct lwp *, const int sys___dup3100(struct lwp *, const struct sys___dup3100_args *, register_t *); -#if defined(SYSVSHM) || !defined(_KERNEL_OPT) int sys_semtimedop(struct lwp *, const struct sys_semtimedop_args *, register_t *); -#endif #endif /* !RUMP_CLIENT */ #endif /* _SYS_SYSCALLARGS_H_ */