Module Name: src
Committed By: christos
Date: Tue Jun 18 16:24:32 UTC 2019
Modified Files:
src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h
netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.140 -r1.141 src/sys/compat/netbsd32/netbsd32_syscallargs.h \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.20 -r1.21 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.139 -r1.140 src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.31 -r1.32 src/sys/compat/netbsd32/netbsd32_systrace_args.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.141 src/sys/compat/netbsd32/netbsd32_syscall.h:1.142
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.141 Mon Jun 17 21:37:04 2019
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Tue Jun 18 12:24:32 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.141 2019/06/18 01:37:04 christos Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.142 2019/06/18 16:24:32 christos Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.126 2019/06/18 01:36:50 christos Exp
+ * created from NetBSD: syscalls.master,v 1.127 2019/06/18 16:23:24 christos Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -1240,9 +1240,13 @@
/* syscall: "netbsd32_futimens" ret: "int" args: "int" "const netbsd32_timespecp_t" */
#define NETBSD32_SYS_netbsd32_futimens 472
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
/* syscall: "netbsd32___quotactl" ret: "int" args: "const netbsd32_charp" "netbsd32_voidp" */
#define NETBSD32_SYS_netbsd32___quotactl 473
+#else
+ /* 473 is excluded netbsd32___quotactl */
+#endif
/* syscall: "netbsd32_posix_spawn" ret: "int" args: "netbsd32_pid_tp" "const netbsd32_charp" "const netbsd32_posix_spawn_file_actionsp" "const netbsd32_posix_spawnattrp" "netbsd32_charpp" "netbsd32_charpp" */
#define NETBSD32_SYS_netbsd32_posix_spawn 474
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.140 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.141
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.140 Mon Jun 17 21:37:04 2019
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Tue Jun 18 12:24:32 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.140 2019/06/18 01:37:04 christos Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.141 2019/06/18 16:24:32 christos Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.126 2019/06/18 01:36:50 christos Exp
+ * created from NetBSD: syscalls.master,v 1.127 2019/06/18 16:23:24 christos Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -2534,12 +2534,15 @@ struct netbsd32_futimens_args {
syscallarg(const netbsd32_timespecp_t) tptr;
};
check_syscall_args(netbsd32_futimens)
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
struct netbsd32___quotactl_args {
syscallarg(const netbsd32_charp) path;
syscallarg(netbsd32_voidp) args;
};
check_syscall_args(netbsd32___quotactl)
+#else
+#endif
struct netbsd32_posix_spawn_args {
syscallarg(netbsd32_pid_tp) pid;
@@ -3424,8 +3427,11 @@ int netbsd32_unlinkat(struct lwp *, cons
int netbsd32_futimens(struct lwp *, const struct netbsd32_futimens_args *, register_t *);
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
int netbsd32___quotactl(struct lwp *, const struct netbsd32___quotactl_args *, register_t *);
+#else
+#endif
int netbsd32_posix_spawn(struct lwp *, const struct netbsd32_posix_spawn_args *, register_t *);
int netbsd32_recvmmsg(struct lwp *, const struct netbsd32_recvmmsg_args *, register_t *);
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.140 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.141
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.140 Mon Jun 17 21:37:04 2019
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Tue Jun 18 12:24:32 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.140 2019/06/18 01:37:04 christos Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.141 2019/06/18 16:24:32 christos Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.126 2019/06/18 01:36:50 christos Exp
+ * created from NetBSD: syscalls.master,v 1.127 2019/06/18 16:23:24 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.140 2019/06/18 01:37:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.141 2019/06/18 16:24:32 christos Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -23,6 +23,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_sys
#include <sys/mount.h>
#include <sys/syscallargs.h>
#include <compat/netbsd32/netbsd32.h>
+#include <compat/netbsd32/netbsd32_syscall.h>
#include <compat/netbsd32/netbsd32_syscallargs.h>
#else /* _KERNEL_OPT */
#include <sys/null.h>
@@ -515,7 +516,11 @@ const char *const netbsd32_syscallnames[
/* 470 */ "netbsd32_symlinkat",
/* 471 */ "netbsd32_unlinkat",
/* 472 */ "netbsd32_futimens",
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
/* 473 */ "netbsd32___quotactl",
+#else
+ /* 473 */ "#473 (excluded netbsd32___quotactl)",
+#endif
/* 474 */ "netbsd32_posix_spawn",
/* 475 */ "netbsd32_recvmmsg",
/* 476 */ "netbsd32_sendmmsg",
@@ -1045,7 +1050,11 @@ const char *const altnetbsd32_syscallnam
/* 470 */ "symlinkat",
/* 471 */ "unlinkat",
/* 472 */ "futimens",
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
/* 473 */ "__quotactl",
+#else
+ /* 473 */ NULL, /* excluded netbsd32___quotactl */
+#endif
/* 474 */ "posix_spawn",
/* 475 */ "recvmmsg",
/* 476 */ "sendmmsg",
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.20 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.21
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.20 Mon Jun 17 21:37:04 2019
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Tue Jun 18 12:24:32 2019
@@ -1,16 +1,29 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.20 2019/06/18 01:37:04 christos Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.21 2019/06/18 16:24:32 christos Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.126 2019/06/18 01:36:50 christos Exp
+ * created from NetBSD: syscalls.master,v 1.127 2019/06/18 16:23:24 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.20 2019/06/18 01:37:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.21 2019/06/18 16:24:32 christos Exp $");
-#include <sys/proc.h>
+#if defined(_KERNEL_OPT)
+#include "opt_compat_netbsd.h"
+#include "opt_ntp.h"
+#include "opt_compat_43.h"
+#include "opt_quota.h"
+#endif
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/signal.h>
+#include <sys/mount.h>
+#include <sys/syscallargs.h>
+#include <compat/netbsd32/netbsd32.h>
+#include <compat/netbsd32/netbsd32_syscall.h>
+#include <compat/netbsd32/netbsd32_syscallargs.h>
static struct sc_autoload netbsd32_syscalls_autoload[] = {
{ NETBSD32_SYS_compat_50_netbsd32_wait4, "compat_netbsd32_50" },
{ NETBSD32_SYS_compat_43_netbsd32_ocreat, "compat_netbsd32_43" },
@@ -64,8 +77,11 @@ static struct sc_autoload netbsd32_sysca
{ 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" },
{ NETBSD32_SYS_netbsd32_nfssvc, "compat_netbsd32_nfssrv" },
{ NETBSD32_SYS_compat_43_netbsd32_ogetdirentries, "compat_netbsd32_43" },
@@ -79,6 +95,9 @@ static struct sc_autoload netbsd32_sysca
{ NETBSD32_SYS_compat_10_omsgsys, "compat_netbsd32_sysvipc_10" },
{ NETBSD32_SYS_compat_10_oshmsys, "compat_netbsd32_sysvipc_10" },
{ NETBSD32_SYS_compat_30_netbsd32_ntp_gettime, "compat_netbsd32_30" },
+#if defined(NTP) || !defined(_KERNEL_OPT)
+#else
+#endif
{ NETBSD32_SYS_compat_12_netbsd32_stat12, "compat_netbsd32_12" },
{ NETBSD32_SYS_compat_12_netbsd32_fstat12, "compat_netbsd32_12" },
{ NETBSD32_SYS_compat_12_netbsd32_lstat12, "compat_netbsd32_12" },
@@ -142,5 +161,11 @@ static struct sc_autoload netbsd32_sysca
{ NETBSD32_SYS_netbsd32_____semctl50, "compat_netbsd32_sysvipc" },
{ NETBSD32_SYS_netbsd32___shmctl50, "compat_netbsd32_sysvipc" },
{ NETBSD32_SYS_netbsd32___msgctl50, "compat_netbsd32_sysvipc" },
+#if defined(NTP) || !defined(_KERNEL_OPT)
+#else
+#endif
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
+#else
+#endif
{ 0, NULL }
};
Index: src/sys/compat/netbsd32/netbsd32_sysent.c
diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.139 src/sys/compat/netbsd32/netbsd32_sysent.c:1.140
--- src/sys/compat/netbsd32/netbsd32_sysent.c:1.139 Mon Jun 17 21:37:04 2019
+++ src/sys/compat/netbsd32/netbsd32_sysent.c Tue Jun 18 12:24:32 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.139 2019/06/18 01:37:04 christos Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.140 2019/06/18 16:24:32 christos Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.126 2019/06/18 01:36:50 christos Exp
+ * created from NetBSD: syscalls.master,v 1.127 2019/06/18 16:23:24 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.139 2019/06/18 01:37:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.140 2019/06/18 16:24:32 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -22,6 +22,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_sys
#include <sys/mount.h>
#include <sys/syscallargs.h>
#include <compat/netbsd32/netbsd32.h>
+#include <compat/netbsd32/netbsd32_syscall.h>
#include <compat/netbsd32/netbsd32_syscallargs.h>
#ifdef COMPAT_43
@@ -1949,10 +1950,16 @@ struct sysent netbsd32_sysent[] = {
ns(struct netbsd32_futimens_args),
.sy_call = (sy_call_t *)netbsd32_futimens
}, /* 472 = netbsd32_futimens */
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
{
ns(struct netbsd32___quotactl_args),
.sy_call = (sy_call_t *)netbsd32___quotactl
}, /* 473 = netbsd32___quotactl */
+#else
+ {
+ .sy_call = sys_nosys,
+ }, /* 473 = filler */
+#endif
{
ns(struct netbsd32_posix_spawn_args),
.sy_call = (sy_call_t *)netbsd32_posix_spawn
Index: src/sys/compat/netbsd32/netbsd32_systrace_args.c
diff -u src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.31 src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.32
--- src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.31 Mon Jun 17 21:37:04 2019
+++ src/sys/compat/netbsd32/netbsd32_systrace_args.c Tue Jun 18 12:24:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_systrace_args.c,v 1.31 2019/06/18 01:37:04 christos Exp $ */
+/* $NetBSD: netbsd32_systrace_args.c,v 1.32 2019/06/18 16:24:32 christos Exp $ */
/*
* System call argument to DTrace register array converstion.
@@ -3385,6 +3385,7 @@ systrace_args(register_t sysnum, const v
*n_args = 2;
break;
}
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
/* netbsd32___quotactl */
case 473: {
const struct netbsd32___quotactl_args *p = params;
@@ -3393,6 +3394,8 @@ systrace_args(register_t sysnum, const v
*n_args = 2;
break;
}
+#else
+#endif
/* netbsd32_posix_spawn */
case 474: {
const struct netbsd32_posix_spawn_args *p = params;
@@ -9218,6 +9221,7 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
/* netbsd32___quotactl */
case 473:
switch(ndx) {
@@ -9231,6 +9235,8 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
+#else
+#endif
/* netbsd32_posix_spawn */
case 474:
switch(ndx) {
@@ -11342,11 +11348,14 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
/* netbsd32___quotactl */
case 473:
if (ndx == 0 || ndx == 1)
p = "int";
break;
+#else
+#endif
/* netbsd32_posix_spawn */
case 474:
if (ndx == 0 || ndx == 1)
