Module Name: src Committed By: dholland Date: Tue Jun 23 04:45:53 UTC 2015
Modified Files: src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.117 src/sys/compat/netbsd32/netbsd32_syscall.h \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.115 -r1.116 src/sys/compat/netbsd32/netbsd32_syscalls.c \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.6 -r1.7 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.116 src/sys/compat/netbsd32/netbsd32_syscall.h:1.117 --- src/sys/compat/netbsd32/netbsd32_syscall.h:1.116 Mon Jun 22 10:35:00 2015 +++ src/sys/compat/netbsd32/netbsd32_syscall.h Tue Jun 23 04:45:53 2015 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscall.h,v 1.116 2015/06/22 10:35:00 mrg Exp $ */ +/* $NetBSD: netbsd32_syscall.h,v 1.117 2015/06/23 04:45:53 dholland Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.107 2015/06/21 12:51:33 martin Exp + * created from NetBSD: syscalls.master,v 1.109 2015/06/23 04:44:08 dholland 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 Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.116 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.117 --- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.116 Mon Jun 22 10:35:00 2015 +++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Tue Jun 23 04:45:53 2015 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscallargs.h,v 1.116 2015/06/22 10:35:00 mrg Exp $ */ +/* $NetBSD: netbsd32_syscallargs.h,v 1.117 2015/06/23 04:45:53 dholland Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.107 2015/06/21 12:51:33 martin Exp + * created from NetBSD: syscalls.master,v 1.109 2015/06/23 04:44:08 dholland Exp */ #ifndef _NETBSD32_SYS_SYSCALLARGS_H_ @@ -815,12 +815,15 @@ struct compat_43_netbsd32_ogetsockname_a 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; @@ -2898,8 +2901,11 @@ int compat_43_sys_quota(struct lwp *, co 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 *); Index: src/sys/compat/netbsd32/netbsd32_syscalls.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.115 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.116 --- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.115 Mon Jun 22 10:35:00 2015 +++ src/sys/compat/netbsd32/netbsd32_syscalls.c Tue Jun 23 04:45:53 2015 @@ -1,18 +1,19 @@ -/* $NetBSD: netbsd32_syscalls.c,v 1.115 2015/06/22 10:35:00 mrg Exp $ */ +/* $NetBSD: netbsd32_syscalls.c,v 1.116 2015/06/23 04:45:53 dholland Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.107 2015/06/21 12:51:33 martin Exp + * created from NetBSD: syscalls.master,v 1.109 2015/06/23 04:44:08 dholland Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.115 2015/06/22 10:35:00 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.116 2015/06/23 04:45:53 dholland 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 @@ const char *const netbsd32_syscallnames[ /* 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", Index: src/sys/compat/netbsd32/netbsd32_sysent.c diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.115 src/sys/compat/netbsd32/netbsd32_sysent.c:1.116 --- src/sys/compat/netbsd32/netbsd32_sysent.c:1.115 Mon Jun 22 10:35:00 2015 +++ src/sys/compat/netbsd32/netbsd32_sysent.c Tue Jun 23 04:45:53 2015 @@ -1,17 +1,18 @@ -/* $NetBSD: netbsd32_sysent.c,v 1.115 2015/06/22 10:35:00 mrg Exp $ */ +/* $NetBSD: netbsd32_sysent.c,v 1.116 2015/06/23 04:45:53 dholland Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.107 2015/06/21 12:51:33 martin Exp + * created from NetBSD: syscalls.master,v 1.109 2015/06/23 04:44:08 dholland Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.115 2015/06/22 10:35:00 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.116 2015/06/23 04:45:53 dholland 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" @@ -707,10 +708,16 @@ struct sysent netbsd32_sysent[] = { { .sy_call = sys_nosys, }, /* 154 = filler */ +#if defined(NFSSERVER) || !defined(_KERNEL_OPT) { ns(struct netbsd32_nfssvc_args), .sy_call = (sy_call_t *)netbsd32_nfssvc }, /* 155 = netbsd32_nfssvc */ +#else + { + .sy_call = sys_nosys, + }, /* 155 = filler */ +#endif { ns(struct compat_43_netbsd32_ogetdirentries_args), .sy_call = (sy_call_t *)compat_43(netbsd32_ogetdirentries) Index: src/sys/compat/netbsd32/netbsd32_systrace_args.c diff -u src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.6 src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.7 --- src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.6 Mon Jun 22 10:35:00 2015 +++ src/sys/compat/netbsd32/netbsd32_systrace_args.c Tue Jun 23 04:45:53 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_systrace_args.c,v 1.6 2015/06/22 10:35:00 mrg Exp $ */ +/* $NetBSD: netbsd32_systrace_args.c,v 1.7 2015/06/23 04:45:53 dholland Exp $ */ /* * System call argument to DTrace register array converstion. @@ -1132,6 +1132,7 @@ systrace_args(register_t sysnum, const v *n_args = 3; break; } +#if defined(NFSSERVER) || !defined(_KERNEL_OPT) /* netbsd32_nfssvc */ case 155: { struct netbsd32_nfssvc_args *p = params; @@ -1140,6 +1141,8 @@ systrace_args(register_t sysnum, const v *n_args = 2; break; } +#else +#endif /* netbsd32_ogetdirentries */ case 156: { struct compat_43_netbsd32_ogetdirentries_args *p = params; @@ -5291,6 +5294,7 @@ systrace_entry_setargdesc(int sysnum, in break; }; break; +#if defined(NFSSERVER) || !defined(_KERNEL_OPT) /* netbsd32_nfssvc */ case 155: switch(ndx) { @@ -5304,6 +5308,8 @@ systrace_entry_setargdesc(int sysnum, in break; }; break; +#else +#endif /* netbsd32_ogetdirentries */ case 156: switch(ndx) { @@ -10009,11 +10015,14 @@ systrace_return_setargdesc(int sysnum, i if (ndx == 0 || ndx == 1) p = "int"; break; +#if defined(NFSSERVER) || !defined(_KERNEL_OPT) /* netbsd32_nfssvc */ case 155: if (ndx == 0 || ndx == 1) p = "int"; break; +#else +#endif /* netbsd32_ogetdirentries */ case 156: if (ndx == 0 || ndx == 1)