Module Name: src Committed By: mlelstv Date: Sat Oct 5 18:06:42 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.344 -r1.345 src/sys/kern/init_sysent.c cvs rdiff -u -r1.332 -r1.333 src/sys/kern/syscalls.c cvs rdiff -u -r1.48 -r1.49 src/sys/kern/syscalls_autoload.c cvs rdiff -u -r1.54 -r1.55 src/sys/kern/systrace_args.c cvs rdiff -u -r1.131 -r1.132 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.162 -r1.163 src/sys/rump/librump/rumpkern/rump_syscalls.c cvs rdiff -u -r1.327 -r1.328 src/sys/sys/syscall.h cvs rdiff -u -r1.310 -r1.311 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.344 src/sys/kern/init_sysent.c:1.345 --- src/sys/kern/init_sysent.c:1.344 Thu Oct 3 16:51:34 2024 +++ src/sys/kern/init_sysent.c Sat Oct 5 18:06:42 2024 @@ -1,14 +1,14 @@ -/* $NetBSD: init_sysent.c,v 1.344 2024/10/03 16:51:34 christos Exp $ */ +/* $NetBSD: init_sysent.c,v 1.345 2024/10/05 18:06:42 mlelstv Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.314 2024/10/03 16:50:52 christos Exp + * created from NetBSD: syscalls.master,v 1.315 2024/10/05 18:04:53 mlelstv Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.344 2024/10/03 16:51:34 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.345 2024/10/05 18:06:42 mlelstv Exp $"); #ifdef _KERNEL_OPT #include "opt_modular.h" @@ -2477,11 +2477,13 @@ 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 }, /* 506 = semtimedop */ +#endif { .sy_call = sys_nosys, }, /* 507 = filler */ Index: src/sys/kern/syscalls.c diff -u src/sys/kern/syscalls.c:1.332 src/sys/kern/syscalls.c:1.333 --- src/sys/kern/syscalls.c:1.332 Thu Oct 3 16:51:35 2024 +++ src/sys/kern/syscalls.c Sat Oct 5 18:06:42 2024 @@ -1,14 +1,14 @@ -/* $NetBSD: syscalls.c,v 1.332 2024/10/03 16:51:35 christos Exp $ */ +/* $NetBSD: syscalls.c,v 1.333 2024/10/05 18:06:42 mlelstv Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.314 2024/10/03 16:50:52 christos Exp + * created from NetBSD: syscalls.master,v 1.315 2024/10/05 18:04:53 mlelstv Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.332 2024/10/03 16:51:35 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.333 2024/10/05 18:06:42 mlelstv Exp $"); #if defined(_KERNEL_OPT) #ifdef _KERNEL_OPT @@ -556,7 +556,9 @@ 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", @@ -1093,7 +1095,9 @@ 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.48 src/sys/kern/syscalls_autoload.c:1.49 --- src/sys/kern/syscalls_autoload.c:1.48 Thu Oct 3 16:51:35 2024 +++ src/sys/kern/syscalls_autoload.c Sat Oct 5 18:06:42 2024 @@ -1,14 +1,14 @@ -/* $NetBSD: syscalls_autoload.c,v 1.48 2024/10/03 16:51:35 christos Exp $ */ +/* $NetBSD: syscalls_autoload.c,v 1.49 2024/10/05 18:06:42 mlelstv Exp $ */ /* * System call autoload table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.314 2024/10/03 16:50:52 christos Exp + * created from NetBSD: syscalls.master,v 1.315 2024/10/05 18:04:53 mlelstv Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.48 2024/10/03 16:51:35 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.49 2024/10/05 18:06:42 mlelstv Exp $"); #ifdef _KERNEL_OPT #include "opt_modular.h" @@ -209,5 +209,7 @@ static struct sc_autoload netbsd_syscall #else #endif { SYS_compat_100_dup3, "compat_100" }, +#if defined(SYSVSHM) || !defined(_KERNEL_OPT) +#endif { 0, NULL } }; Index: src/sys/kern/systrace_args.c diff -u src/sys/kern/systrace_args.c:1.54 src/sys/kern/systrace_args.c:1.55 --- src/sys/kern/systrace_args.c:1.54 Thu Oct 3 16:51:35 2024 +++ src/sys/kern/systrace_args.c Sat Oct 5 18:06:42 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: systrace_args.c,v 1.54 2024/10/03 16:51:35 christos Exp $ */ +/* $NetBSD: systrace_args.c,v 1.55 2024/10/05 18:06:42 mlelstv Exp $ */ /* * System call argument to DTrace register array conversion. @@ -3944,6 +3944,7 @@ 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; @@ -3954,6 +3955,7 @@ systrace_args(register_t sysnum, const v *n_args = 4; break; } +#endif default: *n_args = 0; break; @@ -10664,6 +10666,7 @@ systrace_entry_setargdesc(int sysnum, in break; }; break; +#if defined(SYSVSHM) || !defined(_KERNEL_OPT) /* sys_semtimedop */ case 506: switch(ndx) { @@ -10683,6 +10686,7 @@ systrace_entry_setargdesc(int sysnum, in break; }; break; +#endif default: break; }; @@ -12915,11 +12919,13 @@ 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.131 src/sys/rump/include/rump/rump_syscalls.h:1.132 --- src/sys/rump/include/rump/rump_syscalls.h:1.131 Thu Oct 3 16:51:35 2024 +++ src/sys/rump/include/rump/rump_syscalls.h Sat Oct 5 18:06:42 2024 @@ -1,10 +1,10 @@ -/* $NetBSD: rump_syscalls.h,v 1.131 2024/10/03 16:51:35 christos Exp $ */ +/* $NetBSD: rump_syscalls.h,v 1.132 2024/10/05 18:06:42 mlelstv Exp $ */ /* * System call protos in rump namespace. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.314 2024/10/03 16:50:52 christos Exp + * created from NetBSD: syscalls.master,v 1.315 2024/10/05 18:04:53 mlelstv 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.162 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.163 --- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.162 Thu Oct 3 16:51:35 2024 +++ src/sys/rump/librump/rumpkern/rump_syscalls.c Sat Oct 5 18:06:42 2024 @@ -1,10 +1,10 @@ -/* $NetBSD: rump_syscalls.c,v 1.162 2024/10/03 16:51:35 christos Exp $ */ +/* $NetBSD: rump_syscalls.c,v 1.163 2024/10/05 18:06:42 mlelstv Exp $ */ /* * System call vector and marshalling for rump. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.314 2024/10/03 16:50:52 christos Exp + * created from NetBSD: syscalls.master,v 1.315 2024/10/05 18:04:53 mlelstv Exp */ #ifdef RUMP_CLIENT @@ -15,7 +15,7 @@ #ifdef __NetBSD__ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.162 2024/10/03 16:51:35 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.163 2024/10/05 18:06:42 mlelstv Exp $"); #include <sys/fstypes.h> #include <sys/proc.h> @@ -8659,9 +8659,11 @@ 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, }, /* 506 = semtimedop */ +#endif { .sy_flags = SYCALL_NOSYS, .sy_call = (sy_call_t *)(void *)rumpns_enosys, Index: src/sys/sys/syscall.h diff -u src/sys/sys/syscall.h:1.327 src/sys/sys/syscall.h:1.328 --- src/sys/sys/syscall.h:1.327 Thu Oct 3 16:51:34 2024 +++ src/sys/sys/syscall.h Sat Oct 5 18:06:41 2024 @@ -1,10 +1,10 @@ -/* $NetBSD: syscall.h,v 1.327 2024/10/03 16:51:34 christos Exp $ */ +/* $NetBSD: syscall.h,v 1.328 2024/10/05 18:06:41 mlelstv Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.314 2024/10/03 16:50:52 christos Exp + * created from NetBSD: syscalls.master,v 1.315 2024/10/05 18:04:53 mlelstv Exp */ #ifndef _SYS_SYSCALL_H_ @@ -1422,9 +1422,11 @@ /* 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.310 src/sys/sys/syscallargs.h:1.311 --- src/sys/sys/syscallargs.h:1.310 Thu Oct 3 16:51:34 2024 +++ src/sys/sys/syscallargs.h Sat Oct 5 18:06:41 2024 @@ -1,10 +1,10 @@ -/* $NetBSD: syscallargs.h,v 1.310 2024/10/03 16:51:34 christos Exp $ */ +/* $NetBSD: syscallargs.h,v 1.311 2024/10/05 18:06:41 mlelstv Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.314 2024/10/03 16:50:52 christos Exp + * created from NetBSD: syscalls.master,v 1.315 2024/10/05 18:04:53 mlelstv Exp */ #ifndef _SYS_SYSCALLARGS_H_ @@ -3408,6 +3408,7 @@ 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 { @@ -3418,6 +3419,7 @@ struct sys_semtimedop_args { }; check_syscall_args(sys_semtimedop) #endif /* !RUMP_CLIENT */ +#endif /* * System call prototypes. @@ -4355,7 +4357,9 @@ 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_ */