From 42845fba1ff32f8138386e46417b9429967562f5 Mon Sep 17 00:00:00 2001 From: pgoyette Date: Sat, 7 Mar 2020 00:57:31 +0000 Subject: [PATCH] Regen --- sys/compat/netbsd32/netbsd32_syscall.h | 9 +++------ sys/compat/netbsd32/netbsd32_syscallargs.h | 6 ++---- sys/compat/netbsd32/netbsd32_syscalls.c | 12 +++++------- sys/compat/netbsd32/netbsd32_syscalls_autoload.c | 15 +++++++-------- sys/compat/netbsd32/netbsd32_sysent.c | 13 +++++-------- sys/compat/netbsd32/netbsd32_systrace_args.c | 12 +----------- 6 files changed, 23 insertions(+), 44 deletions(-) diff --git a/sys/compat/netbsd32/netbsd32_syscall.h b/sys/compat/netbsd32/netbsd32_syscall.h index ef64dce8ed2c..930d846c3a09 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.148 2020/01/18 14:07:31 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscall.h,v 1.149 2020/03/07 00:57:31 pgoyette Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.131 2020/01/18 07:33:24 kamil Exp + * created from NetBSD: syscalls.master,v 1.132 2020/03/07 00:56:41 pgoyette Exp */ #ifndef _NETBSD32_SYS_SYSCALL_H_ @@ -432,13 +432,10 @@ /* syscall: "compat_50_netbsd32_quotactl" ret: "int" args: "netbsd32_charp" "int" "int" "netbsd32_voidp" */ #define NETBSD32_SYS_compat_50_netbsd32_quotactl 148 -/* syscall: "compat_43_oquota" ret: "int" args: */ -#define NETBSD32_SYS_compat_43_oquota 149 - #else /* 148 is excluded compat_netbsd32_quotactl */ - /* 149 is excluded compat_netbsd32_quota */ #endif + /* 149 is excluded compat_netbsd32_quota */ /* syscall: "compat_43_netbsd32_ogetsockname" ret: "int" args: "int" "netbsd32_voidp" "netbsd32_intp" */ #define NETBSD32_SYS_compat_43_netbsd32_ogetsockname 150 diff --git a/sys/compat/netbsd32/netbsd32_syscallargs.h b/sys/compat/netbsd32/netbsd32_syscallargs.h index 479694c0fa00..09acd0194652 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.147 2020/01/18 14:07:31 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscallargs.h,v 1.148 2020/03/07 00:57:31 pgoyette Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.131 2020/01/18 07:33:24 kamil Exp + * created from NetBSD: syscalls.master,v 1.132 2020/03/07 00:56:41 pgoyette Exp */ #ifndef _NETBSD32_SYS_SYSCALLARGS_H_ @@ -2928,8 +2928,6 @@ int sys_setsid(struct lwp *, const void *, register_t *); #if defined(QUOTA) || !defined(_KERNEL_OPT) int compat_50_netbsd32_quotactl(struct lwp *, const struct compat_50_netbsd32_quotactl_args *, register_t *); -int compat_43_sys_quota(struct lwp *, const void *, register_t *); - #else #endif int compat_43_netbsd32_ogetsockname(struct lwp *, const struct compat_43_netbsd32_ogetsockname_args *, register_t *); diff --git a/sys/compat/netbsd32/netbsd32_syscalls.c b/sys/compat/netbsd32/netbsd32_syscalls.c index 82ca498427ae..a4ac5046e5c0 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.147 2020/01/18 14:07:31 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscalls.c,v 1.148 2020/03/07 00:57:31 pgoyette Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.131 2020/01/18 07:33:24 kamil Exp + * created from NetBSD: syscalls.master,v 1.132 2020/03/07 00:56:41 pgoyette Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.147 2020/01/18 14:07:31 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.148 2020/03/07 00:57:31 pgoyette Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) @@ -180,11 +180,10 @@ const char *const netbsd32_syscallnames[] = { /* 147 */ "setsid", #if defined(QUOTA) || !defined(_KERNEL_OPT) /* 148 */ "compat_50_netbsd32_quotactl", - /* 149 */ "compat_43_oquota", #else /* 148 */ "#148 (excluded compat_netbsd32_quotactl)", - /* 149 */ "#149 (excluded compat_netbsd32_quota)", #endif + /* 149 */ "#149 (excluded compat_netbsd32_quota)", /* 150 */ "compat_43_netbsd32_ogetsockname", /* 151 */ "#151 (unimplemented)", /* 152 */ "#152 (unimplemented)", @@ -714,11 +713,10 @@ const char *const altnetbsd32_syscallnames[] = { /* 147 */ NULL, /* setsid */ #if defined(QUOTA) || !defined(_KERNEL_OPT) /* 148 */ NULL, /* compat_50_netbsd32_quotactl */ - /* 149 */ NULL, /* compat_43_oquota */ #else /* 148 */ NULL, /* excluded compat_netbsd32_quotactl */ - /* 149 */ NULL, /* excluded compat_netbsd32_quota */ #endif + /* 149 */ NULL, /* excluded compat_netbsd32_quota */ /* 150 */ NULL, /* compat_43_netbsd32_ogetsockname */ /* 151 */ NULL, /* unimplemented */ /* 152 */ NULL, /* unimplemented */ diff --git a/sys/compat/netbsd32/netbsd32_syscalls_autoload.c b/sys/compat/netbsd32/netbsd32_syscalls_autoload.c index afdf12cea764..1be905359a8e 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.27 2020/01/18 14:07:31 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.28 2020/03/07 00:57:31 pgoyette Exp $ */ /* * System call autoload table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.131 2020/01/18 07:33:24 kamil Exp + * created from NetBSD: syscalls.master,v 1.132 2020/03/07 00:56:41 pgoyette Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.27 2020/01/18 14:07:31 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.28 2020/03/07 00:57:31 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -40,16 +40,16 @@ static struct sc_autoload netbsd32_syscalls_autoload[] = { { NETBSD32_SYS_compat_12_netbsd32_reboot, "compat_netbsd32_12" }, { NETBSD32_SYS_compat_43_netbsd32_fstat43, "compat_netbsd32_43" }, { NETBSD32_SYS_compat_43_netbsd32_ogetkerninfo, "compat_netbsd32_43" }, - { NETBSD32_SYS_compat_43_ogetpagesize, "compat_netbsd32_43" }, + { NETBSD32_SYS_compat_43_ogetpagesize, "compat_43" }, { NETBSD32_SYS_compat_12_netbsd32_msync, "compat_netbsd32_12" }, { NETBSD32_SYS_compat_43_netbsd32_ommap, "compat_netbsd32_43" }, { NETBSD32_SYS_compat_50_netbsd32_setitimer, "compat_netbsd32_50" }, - { NETBSD32_SYS_compat_43_owait, "compat_netbsd32_43" }, + { NETBSD32_SYS_compat_43_owait, "compat_43" }, { NETBSD32_SYS_compat_12_netbsd32_oswapon, "compat_netbsd32_12" }, { NETBSD32_SYS_compat_50_netbsd32_getitimer, "compat_netbsd32_50" }, { NETBSD32_SYS_compat_43_netbsd32_ogethostname, "compat_netbsd32_43" }, { NETBSD32_SYS_compat_43_netbsd32_osethostname, "compat_netbsd32_43" }, - { NETBSD32_SYS_compat_43_ogetdtablesize, "compat_netbsd32_43" }, + { NETBSD32_SYS_compat_43_ogetdtablesize, "compat_43" }, { NETBSD32_SYS_compat_50_netbsd32_select, "compat_netbsd32_50" }, { NETBSD32_SYS_compat_30_netbsd32_socket, "compat_netbsd32_30" }, { NETBSD32_SYS_compat_43_netbsd32_oaccept, "compat_netbsd32_43" }, @@ -72,14 +72,13 @@ static struct sc_autoload netbsd32_syscalls_autoload[] = { { NETBSD32_SYS_compat_50_netbsd32_utimes, "compat_netbsd32_50" }, { NETBSD32_SYS_compat_50_netbsd32_adjtime, "compat_netbsd32_50" }, { NETBSD32_SYS_compat_43_netbsd32_ogetpeername, "compat_netbsd32_43" }, - { NETBSD32_SYS_compat_43_ogethostid, "compat_netbsd32_43" }, + { NETBSD32_SYS_compat_43_ogethostid, "compat_43" }, { NETBSD32_SYS_compat_43_netbsd32_sethostid, "compat_netbsd32_43" }, { NETBSD32_SYS_compat_43_netbsd32_ogetrlimit, "compat_netbsd32_43" }, { NETBSD32_SYS_compat_43_netbsd32_osetrlimit, "compat_netbsd32_43" }, { NETBSD32_SYS_compat_43_netbsd32_killpg, "compat_netbsd32_43" }, #if defined(QUOTA) || !defined(_KERNEL_OPT) { NETBSD32_SYS_compat_50_netbsd32_quotactl, "compat_netbsd32_50" }, - { NETBSD32_SYS_compat_43_oquota, "compat_netbsd32_43" }, #else #endif { NETBSD32_SYS_compat_43_netbsd32_ogetsockname, "compat_netbsd32_43" }, diff --git a/sys/compat/netbsd32/netbsd32_sysent.c b/sys/compat/netbsd32/netbsd32_sysent.c index 92025fd7202a..c9c728d8335f 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.146 2020/01/18 14:07:31 pgoyette Exp $ */ +/* $NetBSD: netbsd32_sysent.c,v 1.147 2020/03/07 00:57:31 pgoyette Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.131 2020/01/18 07:33:24 kamil Exp + * created from NetBSD: syscalls.master,v 1.132 2020/03/07 00:56:41 pgoyette Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.146 2020/01/18 14:07:31 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.147 2020/03/07 00:57:31 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -700,17 +700,14 @@ struct sysent netbsd32_sysent[] = { ns(struct compat_50_netbsd32_quotactl_args), .sy_call = (sy_call_t *)sys_nomodule }, /* 148 = compat_50_netbsd32_quotactl */ - { - .sy_call = (sy_call_t *)sys_nomodule - }, /* 149 = compat_43_oquota */ #else { .sy_call = sys_nosys, }, /* 148 = filler */ +#endif { .sy_call = sys_nosys, }, /* 149 = filler */ -#endif { ns(struct compat_43_netbsd32_ogetsockname_args), .sy_call = (sy_call_t *)sys_nomodule @@ -2102,7 +2099,7 @@ const uint32_t netbsd32_sysent_nomodbits[] = { 0xc0b10140, /* syscalls 32- 63 */ 0x23f80083, /* syscalls 64- 95 */ 0x2437f0ea, /* syscalls 96-127 */ - 0x7877f406, /* syscalls 128-159 */ + 0x7857f406, /* syscalls 128-159 */ 0x70008e1e, /* syscalls 160-191 */ 0xf0004010, /* syscalls 192-223 */ 0x001167ff, /* syscalls 224-255 */ diff --git a/sys/compat/netbsd32/netbsd32_systrace_args.c b/sys/compat/netbsd32/netbsd32_systrace_args.c index 2576af09d488..cc838b874f20 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.38 2020/01/18 14:07:31 pgoyette Exp $ */ +/* $NetBSD: netbsd32_systrace_args.c,v 1.39 2020/03/07 00:57:31 pgoyette Exp $ */ /* * System call argument to DTrace register array converstion. @@ -1105,11 +1105,6 @@ systrace_args(register_t sysnum, const void *params, uintptr_t *uarg, size_t *n_ *n_args = 4; break; } - /* sys_quota */ - case 149: { - *n_args = 0; - break; - } #else #endif /* netbsd32_ogetsockname */ @@ -5303,9 +5298,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; - /* sys_quota */ - case 149: - break; #else #endif /* netbsd32_ogetsockname */ @@ -10171,8 +10163,6 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; - /* sys_quota */ - case 149: #else #endif /* netbsd32_ogetsockname */