[src/netbsd-7]: src/sys/compat/netbsd32 Additionally pull up following revisi...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6a210bd90485
branches:  netbsd-7
changeset: 799654:6a210bd90485
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Nov 06 09:16:48 2015 +0000

description:
Additionally pull up following revision(s) (requested by mrg in ticket #956):
        sys/compat/netbsd32/netbsd32_nfssvc.c: revision 1.2
        sys/compat/netbsd32/syscalls.master: revision 1.109
Don't reference netbsd32_nfssvc unless NFSSERVER is defined.
Fixes PR 49994.
add missing opt_nfsserver.h

diffstat:

 sys/compat/netbsd32/netbsd32_nfssvc.c |  5 +++--
 sys/compat/netbsd32/syscalls.master   |  7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diffs (51 lines):

diff -r f5a6ddae34cd -r 6a210bd90485 sys/compat/netbsd32/netbsd32_nfssvc.c
--- a/sys/compat/netbsd32/netbsd32_nfssvc.c     Fri Nov 06 00:55:26 2015 +0000
+++ b/sys/compat/netbsd32/netbsd32_nfssvc.c     Fri Nov 06 09:16:48 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_nfssvc.c,v 1.3.4.2 2015/11/04 17:46:21 riz Exp $      */
+/*     $NetBSD: netbsd32_nfssvc.c,v 1.3.4.3 2015/11/06 09:16:48 martin Exp $   */
 
 /*
  * Copyright (c) 2015 Matthew R. Green
@@ -29,10 +29,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_nfssvc.c,v 1.3.4.2 2015/11/04 17:46:21 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_nfssvc.c,v 1.3.4.3 2015/11/06 09:16:48 martin Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_nfs.h"
+#include "opt_nfsserver.h"
 #include "opt_compat_netbsd.h"
 #endif
 
diff -r f5a6ddae34cd -r 6a210bd90485 sys/compat/netbsd32/syscalls.master
--- a/sys/compat/netbsd32/syscalls.master       Fri Nov 06 00:55:26 2015 +0000
+++ b/sys/compat/netbsd32/syscalls.master       Fri Nov 06 09:16:48 2015 +0000
@@ -1,4 +1,4 @@
-       $NetBSD: syscalls.master,v 1.101.2.2 2015/11/04 17:46:21 riz Exp $
+       $NetBSD: syscalls.master,v 1.101.2.3 2015/11/06 09:16:48 martin Exp $
 
 ;      from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
 ;      @(#)syscalls.master     8.2 (Berkeley) 1/13/94
@@ -38,6 +38,7 @@
 
 #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"
@@ -317,7 +318,11 @@
 152    UNIMPL
 153    UNIMPL
 154    UNIMPL
+#if defined(NFSSERVER) || !defined(_KERNEL_OPT)
 155    STD             { int|netbsd32||nfssvc(int flag, netbsd32_voidp argp); }
+#else
+155    EXCL            netbsd32_nfssvc
+#endif
 156    COMPAT_43       { int|netbsd32||ogetdirentries(int fd, \
                            netbsd32_charp buf, u_int count, \
                            netbsd32_longp basep); }