Fri Nov 6 09:19:24 2015 UTC ()
regen
(martin)
diff -r1.109.2.2 -r1.109.2.3 src/sys/compat/netbsd32/netbsd32_syscall.h
diff -r1.109.2.2 -r1.109.2.3 src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -r1.108.2.2 -r1.108.2.3 src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -r1.108.2.2 -r1.108.2.3 src/sys/compat/netbsd32/netbsd32_sysent.c
--- src/sys/compat/netbsd32/netbsd32_syscall.h 2015/11/04 17:46:21 1.109.2.2
+++ src/sys/compat/netbsd32/netbsd32_syscall.h 2015/11/06 09:19:24 1.109.2.3
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.109.2.2 2015/11/04 17:46:21 riz Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.109.2.3 2015/11/06 09:19:24 martin Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.101.2.1 2015/03/07 05:22:01 snj Exp
+ * created from NetBSD: syscalls.master,v 1.101.2.3 2015/11/06 09:16:48 martin Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -441,9 +441,13 @@
/* syscall: "compat_43_netbsd32_ogetsockname" ret: "int" args: "int" "netbsd32_voidp" "netbsd32_intp" */
#define NETBSD32_SYS_compat_43_netbsd32_ogetsockname 150
+#if defined(NFSSERVER) || !defined(_KERNEL_OPT)
/* syscall: "netbsd32_nfssvc" ret: "int" args: "int" "netbsd32_voidp" */
#define NETBSD32_SYS_netbsd32_nfssvc 155
+#else
+ /* 155 is excluded netbsd32_nfssvc */
+#endif
/* syscall: "compat_43_netbsd32_ogetdirentries" ret: "int" args: "int" "netbsd32_charp" "u_int" "netbsd32_longp" */
#define NETBSD32_SYS_compat_43_netbsd32_ogetdirentries 156
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h 2015/11/04 17:46:21 1.109.2.2
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h 2015/11/06 09:19:24 1.109.2.3
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.109.2.2 2015/11/04 17:46:21 riz Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.109.2.3 2015/11/06 09:19:24 martin Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.101.2.1 2015/03/07 05:22:01 snj Exp
+ * created from NetBSD: syscalls.master,v 1.101.2.3 2015/11/06 09:16:48 martin Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -815,12 +815,15 @@
syscallarg(netbsd32_intp) alen;
};
check_syscall_args(compat_43_netbsd32_ogetsockname)
+#if defined(NFSSERVER) || !defined(_KERNEL_OPT)
struct netbsd32_nfssvc_args {
syscallarg(int) flag;
syscallarg(netbsd32_voidp) argp;
};
check_syscall_args(netbsd32_nfssvc)
+#else
+#endif
struct compat_43_netbsd32_ogetdirentries_args {
syscallarg(int) fd;
@@ -2755,8 +2758,11 @@
int compat_43_netbsd32_ogetsockname(struct lwp *, const struct compat_43_netbsd32_ogetsockname_args *, register_t *);
+#if defined(NFSSERVER) || !defined(_KERNEL_OPT)
int netbsd32_nfssvc(struct lwp *, const struct netbsd32_nfssvc_args *, register_t *);
+#else
+#endif
int compat_43_netbsd32_ogetdirentries(struct lwp *, const struct compat_43_netbsd32_ogetdirentries_args *, register_t *);
int compat_20_netbsd32_statfs(struct lwp *, const struct compat_20_netbsd32_statfs_args *, register_t *);
--- src/sys/compat/netbsd32/netbsd32_syscalls.c 2015/11/04 17:46:21 1.108.2.2
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c 2015/11/06 09:19:24 1.108.2.3
@@ -1,18 +1,19 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.108.2.2 2015/11/04 17:46:21 riz Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.108.2.3 2015/11/06 09:19:24 martin Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.101.2.1 2015/03/07 05:22:01 snj Exp
+ * created from NetBSD: syscalls.master,v 1.101.2.3 2015/11/06 09:16:48 martin Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.108.2.2 2015/11/04 17:46:21 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.108.2.3 2015/11/06 09:19:24 martin Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
+#include "opt_nfsserver.h"
#include "opt_ntp.h"
#include "opt_sysv.h"
#include "opt_compat_43.h"
@@ -182,7 +183,11 @@
/* 152 */ "#152 (unimplemented)",
/* 153 */ "#153 (unimplemented)",
/* 154 */ "#154 (unimplemented)",
+#if defined(NFSSERVER) || !defined(_KERNEL_OPT)
/* 155 */ "netbsd32_nfssvc",
+#else
+ /* 155 */ "#155 (excluded netbsd32_nfssvc)",
+#endif
/* 156 */ "compat_43_netbsd32_ogetdirentries",
/* 157 */ "compat_20_netbsd32_statfs",
/* 158 */ "compat_20_netbsd32_fstatfs",
--- src/sys/compat/netbsd32/netbsd32_sysent.c 2015/11/04 17:46:21 1.108.2.2
+++ src/sys/compat/netbsd32/netbsd32_sysent.c 2015/11/06 09:19:24 1.108.2.3
@@ -1,17 +1,18 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.108.2.2 2015/11/04 17:46:21 riz Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.108.2.3 2015/11/06 09:19:24 martin Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.101.2.1 2015/03/07 05:22:01 snj Exp
+ * created from NetBSD: syscalls.master,v 1.101.2.3 2015/11/06 09:16:48 martin Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.108.2.2 2015/11/04 17:46:21 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.108.2.3 2015/11/06 09:19:24 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
+#include "opt_nfsserver.h"
#include "opt_ntp.h"
#include "opt_sysv.h"
#include "opt_compat_43.h"
@@ -423,8 +424,13 @@
sys_nosys }, /* 153 = unimplemented */
{ 0, 0, 0,
sys_nosys }, /* 154 = unimplemented */
- { 0, 0, 0,
+#if defined(NFSSERVER) || !defined(_KERNEL_OPT)
+ { ns(struct netbsd32_nfssvc_args), 0,
(sy_call_t *)netbsd32_nfssvc }, /* 155 = netbsd32_nfssvc */
+#else
+ { 0, 0, 0,
+ sys_nosys }, /* 155 = excluded netbsd32_nfssvc */
+#endif
{ ns(struct compat_43_netbsd32_ogetdirentries_args), 0,
(sy_call_t *)compat_43(netbsd32_ogetdirentries) },/* 156 = compat_43_netbsd32_ogetdirentries */
{ ns(struct compat_20_netbsd32_statfs_args), 0,