Module Name: src
Committed By: pgoyette
Date: Thu Mar 12 15:03:15 UTC 2020
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.149 -r1.150 src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.148 -r1.149 src/sys/compat/netbsd32/netbsd32_syscallargs.h \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.28 -r1.29 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.147 -r1.148 src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.39 -r1.40 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.149 src/sys/compat/netbsd32/netbsd32_syscall.h:1.150
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.149 Sat Mar 7 00:57:31 2020
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Thu Mar 12 15:03:15 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.149 2020/03/07 00:57:31 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.150 2020/03/12 15:03:15 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.132 2020/03/07 00:56:41 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.133 2020/03/12 15:02:29 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -428,13 +428,9 @@
/* syscall: "setsid" ret: "int" args: */
#define NETBSD32_SYS_setsid 147
-#if defined(QUOTA) || !defined(_KERNEL_OPT)
/* syscall: "compat_50_netbsd32_quotactl" ret: "int" args: "netbsd32_charp" "int" "int" "netbsd32_voidp" */
#define NETBSD32_SYS_compat_50_netbsd32_quotactl 148
-#else
- /* 148 is excluded compat_netbsd32_quotactl */
-#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
@@ -1237,13 +1233,9 @@
/* 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.148 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.149
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.148 Sat Mar 7 00:57:31 2020
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Thu Mar 12 15:03:15 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.148 2020/03/07 00:57:31 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.149 2020/03/12 15:03:15 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.132 2020/03/07 00:56:41 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.133 2020/03/12 15:02:29 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -793,7 +793,6 @@ struct compat_43_netbsd32_killpg_args {
syscallarg(int) signum;
};
check_syscall_args(compat_43_netbsd32_killpg)
-#if defined(QUOTA) || !defined(_KERNEL_OPT)
struct compat_50_netbsd32_quotactl_args {
syscallarg(netbsd32_charp) path;
@@ -802,8 +801,6 @@ struct compat_50_netbsd32_quotactl_args
syscallarg(netbsd32_voidp) arg;
};
check_syscall_args(compat_50_netbsd32_quotactl)
-#else
-#endif
struct compat_43_netbsd32_ogetsockname_args {
syscallarg(int) fdec;
@@ -2534,15 +2531,12 @@ 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;
@@ -2925,11 +2919,8 @@ int compat_43_netbsd32_killpg(struct lwp
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 *);
-#else
-#endif
int compat_43_netbsd32_ogetsockname(struct lwp *, const struct compat_43_netbsd32_ogetsockname_args *, register_t *);
int netbsd32_nfssvc(struct lwp *, const struct netbsd32_nfssvc_args *, register_t *);
@@ -3454,11 +3445,8 @@ 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.148 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.149
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.148 Sat Mar 7 00:57:31 2020
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Thu Mar 12 15:03:15 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.148 2020/03/07 00:57:31 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.149 2020/03/12 15:03:15 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.132 2020/03/07 00:56:41 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.133 2020/03/12 15:02:29 pgoyette Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.148 2020/03/07 00:57:31 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.149 2020/03/12 15:03:15 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -178,11 +178,7 @@ const char *const netbsd32_syscallnames[
/* 145 */ "compat_43_netbsd32_osetrlimit",
/* 146 */ "compat_43_netbsd32_killpg",
/* 147 */ "setsid",
-#if defined(QUOTA) || !defined(_KERNEL_OPT)
/* 148 */ "compat_50_netbsd32_quotactl",
-#else
- /* 148 */ "#148 (excluded compat_netbsd32_quotactl)",
-#endif
/* 149 */ "#149 (excluded compat_netbsd32_quota)",
/* 150 */ "compat_43_netbsd32_ogetsockname",
/* 151 */ "#151 (unimplemented)",
@@ -515,11 +511,7 @@ 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",
@@ -711,11 +703,7 @@ const char *const altnetbsd32_syscallnam
/* 145 */ NULL, /* compat_43_netbsd32_osetrlimit */
/* 146 */ NULL, /* compat_43_netbsd32_killpg */
/* 147 */ NULL, /* setsid */
-#if defined(QUOTA) || !defined(_KERNEL_OPT)
/* 148 */ NULL, /* compat_50_netbsd32_quotactl */
-#else
- /* 148 */ NULL, /* excluded compat_netbsd32_quotactl */
-#endif
/* 149 */ NULL, /* excluded compat_netbsd32_quota */
/* 150 */ NULL, /* compat_43_netbsd32_ogetsockname */
/* 151 */ NULL, /* unimplemented */
@@ -1048,11 +1036,7 @@ 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.28 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.29
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.28 Sat Mar 7 00:57:31 2020
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Thu Mar 12 15:03:15 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.28 2020/03/07 00:57:31 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.29 2020/03/12 15:03:15 pgoyette Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.132 2020/03/07 00:56:41 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.133 2020/03/12 15:02:29 pgoyette Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.28 2020/03/07 00:57:31 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.29 2020/03/12 15:03:15 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -77,10 +77,7 @@ 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" },
-#else
-#endif
+ { NETBSD32_SYS_compat_50_netbsd32_quotactl, "compat_netbsd32_quota_50" },
{ 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" },
@@ -167,8 +164,6 @@ static struct sc_autoload netbsd32_sysca
#if defined(NTP) || !defined(_KERNEL_OPT)
#else
#endif
-#if defined(QUOTA) || !defined(_KERNEL_OPT)
-#else
-#endif
+ { NETBSD32_SYS_netbsd32___quotactl, "compat_netbsd32_quota" },
{ 0, NULL }
};
Index: src/sys/compat/netbsd32/netbsd32_sysent.c
diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.147 src/sys/compat/netbsd32/netbsd32_sysent.c:1.148
--- src/sys/compat/netbsd32/netbsd32_sysent.c:1.147 Sat Mar 7 00:57:31 2020
+++ src/sys/compat/netbsd32/netbsd32_sysent.c Thu Mar 12 15:03:15 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.147 2020/03/07 00:57:31 pgoyette Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.148 2020/03/12 15:03:15 pgoyette Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.132 2020/03/07 00:56:41 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.133 2020/03/12 15:02:29 pgoyette Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.147 2020/03/07 00:57:31 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.148 2020/03/12 15:03:15 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -695,16 +695,10 @@ struct sysent netbsd32_sysent[] = {
{
.sy_call = (sy_call_t *)sys_setsid
}, /* 147 = setsid */
-#if defined(QUOTA) || !defined(_KERNEL_OPT)
{
ns(struct compat_50_netbsd32_quotactl_args),
.sy_call = (sy_call_t *)sys_nomodule
}, /* 148 = compat_50_netbsd32_quotactl */
-#else
- {
- .sy_call = sys_nosys,
- }, /* 148 = filler */
-#endif
{
.sy_call = sys_nosys,
}, /* 149 = filler */
@@ -1953,16 +1947,10 @@ 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
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 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
@@ -2109,6 +2097,6 @@ const uint32_t netbsd32_sysent_nomodbits
0x006000f0, /* syscalls 352-383 */
0x00006338, /* syscalls 384-415 */
0x1c070000, /* syscalls 416-447 */
- 0x00000000, /* syscalls 448-479 */
+ 0x02000000, /* syscalls 448-479 */
0x00000000, /* syscalls 480-511 */
};
Index: src/sys/compat/netbsd32/netbsd32_systrace_args.c
diff -u src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.39 src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.40
--- src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.39 Sat Mar 7 00:57:31 2020
+++ src/sys/compat/netbsd32/netbsd32_systrace_args.c Thu Mar 12 15:03:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_systrace_args.c,v 1.39 2020/03/07 00:57:31 pgoyette Exp $ */
+/* $NetBSD: netbsd32_systrace_args.c,v 1.40 2020/03/12 15:03:15 pgoyette Exp $ */
/*
* System call argument to DTrace register array converstion.
@@ -1094,7 +1094,6 @@ systrace_args(register_t sysnum, const v
*n_args = 0;
break;
}
-#if defined(QUOTA) || !defined(_KERNEL_OPT)
/* netbsd32_quotactl */
case 148: {
const struct compat_50_netbsd32_quotactl_args *p = params;
@@ -1105,8 +1104,6 @@ systrace_args(register_t sysnum, const v
*n_args = 4;
break;
}
-#else
-#endif
/* netbsd32_ogetsockname */
case 150: {
const struct compat_43_netbsd32_ogetsockname_args *p = params;
@@ -3380,7 +3377,6 @@ 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;
@@ -3389,8 +3385,6 @@ 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;
@@ -5278,7 +5272,6 @@ systrace_entry_setargdesc(int sysnum, in
/* sys_setsid */
case 147:
break;
-#if defined(QUOTA) || !defined(_KERNEL_OPT)
/* netbsd32_quotactl */
case 148:
switch(ndx) {
@@ -5298,8 +5291,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#else
-#endif
/* netbsd32_ogetsockname */
case 150:
switch(ndx) {
@@ -9250,7 +9241,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#if defined(QUOTA) || !defined(_KERNEL_OPT)
/* netbsd32___quotactl */
case 473:
switch(ndx) {
@@ -9264,8 +9254,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#else
-#endif
/* netbsd32_posix_spawn */
case 474:
switch(ndx) {
@@ -10157,14 +10145,11 @@ systrace_return_setargdesc(int sysnum, i
break;
/* sys_setsid */
case 147:
-#if defined(QUOTA) || !defined(_KERNEL_OPT)
/* netbsd32_quotactl */
case 148:
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#else
-#endif
/* netbsd32_ogetsockname */
case 150:
if (ndx == 0 || ndx == 1)
@@ -11442,14 +11427,11 @@ 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)
