From a1ae221d59074cdbea0e1ab3e24ba2efb9e4bfd3 Mon Sep 17 00:00:00 2001 From: thorpej Date: Wed, 22 Apr 2020 21:25:17 +0000 Subject: [PATCH] Regen for removal of _lwp_gettid(2). --- sys/compat/netbsd32/netbsd32_syscall.h | 7 ++----- sys/compat/netbsd32/netbsd32_syscallargs.h | 6 ++---- sys/compat/netbsd32/netbsd32_syscalls.c | 10 +++++----- sys/compat/netbsd32/netbsd32_syscalls_autoload.c | 6 +++--- sys/compat/netbsd32/netbsd32_sysent.c | 10 +++++----- sys/compat/netbsd32/netbsd32_systrace_args.c | 12 +----------- sys/kern/init_sysent.c | 10 +++++----- sys/kern/syscalls.c | 10 +++++----- sys/kern/syscalls_autoload.c | 6 +++--- sys/kern/systrace_args.c | 12 +----------- sys/rump/include/rump/rump_syscalls.h | 4 ++-- sys/rump/librump/rumpkern/rump_syscalls.c | 9 +++++---- sys/sys/syscall.h | 7 ++----- sys/sys/syscallargs.h | 6 ++---- 14 files changed, 43 insertions(+), 72 deletions(-) diff --git a/sys/compat/netbsd32/netbsd32_syscall.h b/sys/compat/netbsd32/netbsd32_syscall.h index cc256ee52fb2..d0d50615115f 100644 --- a/sys/compat/netbsd32/netbsd32_syscall.h +++ b/sys/compat/netbsd32/netbsd32_syscall.h @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscall.h,v 1.151 2020/04/04 20:27:27 thorpej Exp $ */ +/* $NetBSD: netbsd32_syscall.h,v 1.152 2020/04/22 21:25:17 thorpej Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.134 2020/04/04 20:20:12 thorpej Exp + * created from NetBSD: syscalls.master,v 1.135 2020/04/22 21:22:21 thorpej Exp */ #ifndef _NETBSD32_SYS_SYSCALL_H_ @@ -875,9 +875,6 @@ /* syscall: "netbsd32__lwp_ctl" ret: "int" args: "int" "netbsd32_pointer_t" */ #define NETBSD32_SYS_netbsd32__lwp_ctl 325 -/* syscall: "_lwp_gettid" ret: "lwptid_t" args: */ -#define NETBSD32_SYS__lwp_gettid 326 - /* 330 is obsolete netbsd32_sa_register */ /* 331 is obsolete netbsd32_sa_stacks */ /* 332 is obsolete sa_enable */ diff --git a/sys/compat/netbsd32/netbsd32_syscallargs.h b/sys/compat/netbsd32/netbsd32_syscallargs.h index fe9a623ff83d..7915c38781c8 100644 --- a/sys/compat/netbsd32/netbsd32_syscallargs.h +++ b/sys/compat/netbsd32/netbsd32_syscallargs.h @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscallargs.h,v 1.150 2020/04/04 20:27:27 thorpej Exp $ */ +/* $NetBSD: netbsd32_syscallargs.h,v 1.151 2020/04/22 21:25:17 thorpej Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.134 2020/04/04 20:20:12 thorpej Exp + * created from NetBSD: syscalls.master,v 1.135 2020/04/22 21:22:21 thorpej Exp */ #ifndef _NETBSD32_SYS_SYSCALLARGS_H_ @@ -3214,8 +3214,6 @@ int netbsd32__lwp_getname(struct lwp *, const struct netbsd32__lwp_getname_args int netbsd32__lwp_ctl(struct lwp *, const struct netbsd32__lwp_ctl_args *, register_t *); -int sys__lwp_gettid(struct lwp *, const void *, register_t *); - int netbsd32___sigaction_sigtramp(struct lwp *, const struct netbsd32___sigaction_sigtramp_args *, register_t *); int netbsd32_rasctl(struct lwp *, const struct netbsd32_rasctl_args *, register_t *); diff --git a/sys/compat/netbsd32/netbsd32_syscalls.c b/sys/compat/netbsd32/netbsd32_syscalls.c index 3df3acd39e14..f344b780bcf6 100644 --- a/sys/compat/netbsd32/netbsd32_syscalls.c +++ b/sys/compat/netbsd32/netbsd32_syscalls.c @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls.c,v 1.150 2020/04/04 20:27:27 thorpej Exp $ */ +/* $NetBSD: netbsd32_syscalls.c,v 1.151 2020/04/22 21:25:18 thorpej Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.134 2020/04/04 20:20:12 thorpej Exp + * created from NetBSD: syscalls.master,v 1.135 2020/04/22 21:22:21 thorpej Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.150 2020/04/04 20:27:27 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.151 2020/04/22 21:25:18 thorpej Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) @@ -360,7 +360,7 @@ const char *const netbsd32_syscallnames[] = { /* 323 */ "netbsd32__lwp_setname", /* 324 */ "netbsd32__lwp_getname", /* 325 */ "netbsd32__lwp_ctl", - /* 326 */ "_lwp_gettid", + /* 326 */ "#326 (unimplemented)", /* 327 */ "#327 (unimplemented)", /* 328 */ "#328 (unimplemented)", /* 329 */ "#329 (unimplemented)", @@ -885,7 +885,7 @@ const char *const altnetbsd32_syscallnames[] = { /* 323 */ "_lwp_setname", /* 324 */ "_lwp_getname", /* 325 */ "_lwp_ctl", - /* 326 */ NULL, /* _lwp_gettid */ + /* 326 */ NULL, /* unimplemented */ /* 327 */ NULL, /* unimplemented */ /* 328 */ NULL, /* unimplemented */ /* 329 */ NULL, /* unimplemented */ diff --git a/sys/compat/netbsd32/netbsd32_syscalls_autoload.c b/sys/compat/netbsd32/netbsd32_syscalls_autoload.c index 9fbca6100049..a229d3a1f2b2 100644 --- a/sys/compat/netbsd32/netbsd32_syscalls_autoload.c +++ b/sys/compat/netbsd32/netbsd32_syscalls_autoload.c @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.30 2020/04/04 20:27:27 thorpej Exp $ */ +/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.31 2020/04/22 21:25:18 thorpej Exp $ */ /* * System call autoload table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.134 2020/04/04 20:20:12 thorpej Exp + * created from NetBSD: syscalls.master,v 1.135 2020/04/22 21:22:21 thorpej Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.30 2020/04/04 20:27:27 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.31 2020/04/22 21:25:18 thorpej Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" diff --git a/sys/compat/netbsd32/netbsd32_sysent.c b/sys/compat/netbsd32/netbsd32_sysent.c index e2f59df53446..4ce4456f0677 100644 --- a/sys/compat/netbsd32/netbsd32_sysent.c +++ b/sys/compat/netbsd32/netbsd32_sysent.c @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_sysent.c,v 1.149 2020/04/04 20:27:27 thorpej Exp $ */ +/* $NetBSD: netbsd32_sysent.c,v 1.150 2020/04/22 21:25:18 thorpej Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.134 2020/04/04 20:20:12 thorpej Exp + * created from NetBSD: syscalls.master,v 1.135 2020/04/22 21:22:21 thorpej Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.149 2020/04/04 20:27:27 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.150 2020/04/22 21:25:18 thorpej Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -1385,8 +1385,8 @@ struct sysent netbsd32_sysent[] = { .sy_call = (sy_call_t *)netbsd32__lwp_ctl }, /* 325 = netbsd32__lwp_ctl */ { - .sy_call = (sy_call_t *)sys__lwp_gettid - }, /* 326 = _lwp_gettid */ + .sy_call = sys_nosys, + }, /* 326 = filler */ { .sy_call = sys_nosys, }, /* 327 = filler */ diff --git a/sys/compat/netbsd32/netbsd32_systrace_args.c b/sys/compat/netbsd32/netbsd32_systrace_args.c index bdb40d822ffb..e9862caa02cd 100644 --- a/sys/compat/netbsd32/netbsd32_systrace_args.c +++ b/sys/compat/netbsd32/netbsd32_systrace_args.c @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_systrace_args.c,v 1.41 2020/04/04 20:27:27 thorpej Exp $ */ +/* $NetBSD: netbsd32_systrace_args.c,v 1.42 2020/04/22 21:25:18 thorpej Exp $ */ /* * System call argument to DTrace register array converstion. @@ -2313,11 +2313,6 @@ systrace_args(register_t sysnum, const void *params, uintptr_t *uarg, size_t *n_ *n_args = 2; break; } - /* sys__lwp_gettid */ - case 326: { - *n_args = 0; - break; - } /* netbsd32___sigaction_sigtramp */ case 340: { const struct netbsd32___sigaction_sigtramp_args *p = params; @@ -7316,9 +7311,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; - /* sys__lwp_gettid */ - case 326: - break; /* netbsd32___sigaction_sigtramp */ case 340: switch(ndx) { @@ -10868,8 +10860,6 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; - /* sys__lwp_gettid */ - case 326: /* netbsd32___sigaction_sigtramp */ case 340: if (ndx == 0 || ndx == 1) diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index cb6de7ec7804..5ebf02272fa2 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -1,14 +1,14 @@ -/* $NetBSD: init_sysent.c,v 1.328 2020/04/04 20:27:27 thorpej Exp $ */ +/* $NetBSD: init_sysent.c,v 1.329 2020/04/22 21:25:17 thorpej Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.298 2020/04/04 20:20:12 thorpej Exp + * created from NetBSD: syscalls.master,v 1.302 2020/04/22 21:22:21 thorpej Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.328 2020/04/04 20:27:27 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.329 2020/04/22 21:25:17 thorpej Exp $"); #ifdef _KERNEL_OPT #include "opt_modular.h" @@ -1597,8 +1597,8 @@ struct sysent sysent[] = { .sy_call = (sy_call_t *)sys__lwp_ctl }, /* 325 = _lwp_ctl */ { - .sy_call = (sy_call_t *)sys__lwp_gettid - }, /* 326 = _lwp_gettid */ + .sy_call = sys_nosys, + }, /* 326 = filler */ { .sy_call = sys_nosys, }, /* 327 = filler */ diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index bf562242c5ea..bbe780336897 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -1,14 +1,14 @@ -/* $NetBSD: syscalls.c,v 1.316 2020/04/04 20:27:27 thorpej Exp $ */ +/* $NetBSD: syscalls.c,v 1.317 2020/04/22 21:25:17 thorpej Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.298 2020/04/04 20:20:12 thorpej Exp + * created from NetBSD: syscalls.master,v 1.302 2020/04/22 21:22:21 thorpej Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.316 2020/04/04 20:27:27 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.317 2020/04/22 21:25:17 thorpej Exp $"); #if defined(_KERNEL_OPT) #ifdef _KERNEL_OPT @@ -371,7 +371,7 @@ const char *const syscallnames[] = { /* 323 */ "_lwp_setname", /* 324 */ "_lwp_getname", /* 325 */ "_lwp_ctl", - /* 326 */ "_lwp_gettid", + /* 326 */ "#326 (unimplemented)", /* 327 */ "#327 (unimplemented)", /* 328 */ "#328 (unimplemented)", /* 329 */ "#329 (unimplemented)", @@ -908,7 +908,7 @@ const char *const altsyscallnames[] = { /* 323 */ NULL, /* _lwp_setname */ /* 324 */ NULL, /* _lwp_getname */ /* 325 */ NULL, /* _lwp_ctl */ - /* 326 */ NULL, /* _lwp_gettid */ + /* 326 */ NULL, /* unimplemented */ /* 327 */ NULL, /* unimplemented */ /* 328 */ NULL, /* unimplemented */ /* 329 */ NULL, /* unimplemented */ diff --git a/sys/kern/syscalls_autoload.c b/sys/kern/syscalls_autoload.c index e45194643920..1dc1dc12be96 100644 --- a/sys/kern/syscalls_autoload.c +++ b/sys/kern/syscalls_autoload.c @@ -1,14 +1,14 @@ -/* $NetBSD: syscalls_autoload.c,v 1.33 2020/04/04 20:27:27 thorpej Exp $ */ +/* $NetBSD: syscalls_autoload.c,v 1.34 2020/04/22 21:25:17 thorpej Exp $ */ /* * System call autoload table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.298 2020/04/04 20:20:12 thorpej Exp + * created from NetBSD: syscalls.master,v 1.302 2020/04/22 21:22:21 thorpej Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.33 2020/04/04 20:27:27 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.34 2020/04/22 21:25:17 thorpej Exp $"); #ifdef _KERNEL_OPT #include "opt_modular.h" diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index a7403fe1f1fc..157d8a95e11e 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -1,4 +1,4 @@ -/* $NetBSD: systrace_args.c,v 1.35 2020/04/04 20:27:27 thorpej Exp $ */ +/* $NetBSD: systrace_args.c,v 1.36 2020/04/22 21:25:17 thorpej Exp $ */ /* * System call argument to DTrace register array converstion. @@ -2374,11 +2374,6 @@ systrace_args(register_t sysnum, const void *params, uintptr_t *uarg, size_t *n_ *n_args = 2; break; } - /* sys__lwp_gettid */ - case 326: { - *n_args = 0; - break; - } /* sys_sa_register */ case 330: { const struct compat_60_sys_sa_register_args *p = params; @@ -7597,9 +7592,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; - /* sys__lwp_gettid */ - case 326: - break; /* sys_sa_register */ case 330: switch(ndx) { @@ -11373,8 +11365,6 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; - /* sys__lwp_gettid */ - case 326: /* sys_sa_register */ case 330: if (ndx == 0 || ndx == 1) diff --git a/sys/rump/include/rump/rump_syscalls.h b/sys/rump/include/rump/rump_syscalls.h index f603b84e97a3..80a00a32c08f 100644 --- a/sys/rump/include/rump/rump_syscalls.h +++ b/sys/rump/include/rump/rump_syscalls.h @@ -1,10 +1,10 @@ -/* $NetBSD: rump_syscalls.h,v 1.114 2020/04/04 20:27:27 thorpej Exp $ */ +/* $NetBSD: rump_syscalls.h,v 1.115 2020/04/22 21:25:17 thorpej Exp $ */ /* * System call protos in rump namespace. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.298 2020/04/04 20:20:12 thorpej Exp + * created from NetBSD: syscalls.master,v 1.302 2020/04/22 21:22:21 thorpej Exp */ #ifndef _RUMP_RUMP_SYSCALLS_H_ diff --git a/sys/rump/librump/rumpkern/rump_syscalls.c b/sys/rump/librump/rumpkern/rump_syscalls.c index 3514b1325c09..59f471ef2892 100644 --- a/sys/rump/librump/rumpkern/rump_syscalls.c +++ b/sys/rump/librump/rumpkern/rump_syscalls.c @@ -1,10 +1,10 @@ -/* $NetBSD: rump_syscalls.c,v 1.145 2020/04/04 20:27:27 thorpej Exp $ */ +/* $NetBSD: rump_syscalls.c,v 1.146 2020/04/22 21:25:17 thorpej Exp $ */ /* * System call vector and marshalling for rump. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.298 2020/04/04 20:20:12 thorpej Exp + * created from NetBSD: syscalls.master,v 1.302 2020/04/22 21:22:21 thorpej Exp */ #ifdef RUMP_CLIENT @@ -15,7 +15,7 @@ #ifdef __NetBSD__ #include -__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.145 2020/04/04 20:27:27 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.146 2020/04/22 21:25:17 thorpej Exp $"); #include #include @@ -7821,8 +7821,9 @@ struct sysent rump_sysent[] = { .sy_call = (sy_call_t *)(void *)rumpns_enosys, }, /* 325 = _lwp_ctl */ { + .sy_flags = SYCALL_NOSYS, .sy_call = (sy_call_t *)(void *)rumpns_enosys, -}, /* 326 = _lwp_gettid */ + }, /* 326 = filler */ { .sy_flags = SYCALL_NOSYS, .sy_call = (sy_call_t *)(void *)rumpns_enosys, diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index da3654f978c2..78aad1bbe61b 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -1,10 +1,10 @@ -/* $NetBSD: syscall.h,v 1.310 2020/04/04 20:27:27 thorpej Exp $ */ +/* $NetBSD: syscall.h,v 1.311 2020/04/22 21:25:17 thorpej Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.298 2020/04/04 20:20:12 thorpej Exp + * created from NetBSD: syscalls.master,v 1.302 2020/04/22 21:22:21 thorpej Exp */ #ifndef _SYS_SYSCALL_H_ @@ -900,9 +900,6 @@ /* syscall: "_lwp_ctl" ret: "int" args: "int" "struct lwpctl **" */ #define SYS__lwp_ctl 325 -/* syscall: "_lwp_gettid" ret: "lwptid_t" args: */ -#define SYS__lwp_gettid 326 - /* syscall: "compat_60_sa_register" ret: "int" args: "void *" "void **" "int" "ssize_t" */ #define SYS_compat_60_sa_register 330 diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h index 1901cc0d97db..40fff1e261bd 100644 --- a/sys/sys/syscallargs.h +++ b/sys/sys/syscallargs.h @@ -1,10 +1,10 @@ -/* $NetBSD: syscallargs.h,v 1.294 2020/04/04 20:27:27 thorpej Exp $ */ +/* $NetBSD: syscallargs.h,v 1.295 2020/04/22 21:25:17 thorpej Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.298 2020/04/04 20:20:12 thorpej Exp + * created from NetBSD: syscalls.master,v 1.302 2020/04/22 21:22:21 thorpej Exp */ #ifndef _SYS_SYSCALLARGS_H_ @@ -3766,8 +3766,6 @@ int sys__lwp_getname(struct lwp *, const struct sys__lwp_getname_args *, registe int sys__lwp_ctl(struct lwp *, const struct sys__lwp_ctl_args *, register_t *); -int sys__lwp_gettid(struct lwp *, const void *, register_t *); - int compat_60_sys_sa_register(struct lwp *, const struct compat_60_sys_sa_register_args *, register_t *); int compat_60_sys_sa_stacks(struct lwp *, const struct compat_60_sys_sa_stacks_args *, register_t *);