5 files changed, 7 insertions, 49 deletions

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 86e567a0c237a..6056f3a754480 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.master,v 1.43 1997/09/14 16:51:14 phk Exp 
+ * created from	Id: syscalls.master,v 1.44 1997/10/26 20:27:51 phk Exp 
  */
 
 #include <sys/param.h>
@@ -172,21 +172,13 @@ struct sysent sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 152 = sem_wakeup */
 	{ 0, (sy_call_t *)nosys },			/* 153 = asyncdaemon */
 	{ 0, (sy_call_t *)nosys },			/* 154 = nosys */
-#ifdef NFS
-	{ 2, (sy_call_t *)nfssvc },			/* 155 = nfssvc */
-#else
-	{ 0, (sy_call_t *)nosys },			/* 155 = nosys */
-#endif
+	{ 2, (sy_call_t *)nosys },			/* 155 = nfssvc */
 	{ compat(4,getdirentries) },		/* 156 = old getdirentries */
 	{ 2, (sy_call_t *)statfs },			/* 157 = statfs */
 	{ 2, (sy_call_t *)fstatfs },			/* 158 = fstatfs */
 	{ 0, (sy_call_t *)nosys },			/* 159 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 160 = nosys */
-#if defined(NFS) && !defined (NFS_NOSERVER)
-	{ 2, (sy_call_t *)getfh },			/* 161 = getfh */
-#else
-	{ 0, (sy_call_t *)nosys },			/* 161 = nosys */
-#endif
+	{ 2, (sy_call_t *)nosys },			/* 161 = getfh */
 	{ 2, (sy_call_t *)getdomainname },		/* 162 = getdomainname */
 	{ 2, (sy_call_t *)setdomainname },		/* 163 = setdomainname */
 	{ 1, (sy_call_t *)uname },			/* 164 = uname */
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 41a31845866e6..68645dff762d5 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.master,v 1.43 1997/09/14 16:51:14 phk Exp 
+ * created from	Id: syscalls.master,v 1.44 1997/10/26 20:27:51 phk Exp 
  */
 
 char *syscallnames[] = {
@@ -161,21 +161,13 @@ char *syscallnames[] = {
 	"#152",			/* 152 = sem_wakeup */
 	"#153",			/* 153 = asyncdaemon */
 	"#154",			/* 154 = nosys */
-#ifdef NFS
 	"nfssvc",			/* 155 = nfssvc */
-#else
-	"#155",			/* 155 = nosys */
-#endif
 	"old.getdirentries",		/* 156 = old getdirentries */
 	"statfs",			/* 157 = statfs */
 	"fstatfs",			/* 158 = fstatfs */
 	"#159",			/* 159 = nosys */
 	"#160",			/* 160 = nosys */
-#if defined(NFS) && !defined (NFS_NOSERVER)
 	"getfh",			/* 161 = getfh */
-#else
-	"#161",			/* 161 = nosys */
-#endif
 	"getdomainname",			/* 162 = getdomainname */
 	"setdomainname",			/* 163 = setdomainname */
 	"uname",			/* 164 = uname */
diff --git a/sys/sys/syscall-hide.h b/sys/sys/syscall-hide.h
index 9089054e467ac..b940734314f83 100644
--- a/sys/sys/syscall-hide.h
+++ b/sys/sys/syscall-hide.h
@@ -2,7 +2,7 @@
  * System call hiders.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.master,v 1.43 1997/09/14 16:51:14 phk Exp 
+ * created from	Id: syscalls.master,v 1.44 1997/10/26 20:27:51 phk Exp 
  */
 
 HIDE_POSIX(fork)
@@ -145,19 +145,11 @@ HIDE_POSIX(setsid)
 HIDE_BSD(quotactl)
 HIDE_BSD(quota)
 HIDE_BSD(getsockname)
-#ifdef NFS
 HIDE_BSD(nfssvc)
-#else
-HIDE_BSD(nosys)
-#endif
 HIDE_BSD(getdirentries)
 HIDE_BSD(statfs)
 HIDE_BSD(fstatfs)
-#if defined(NFS) && !defined (NFS_NOSERVER)
 HIDE_BSD(getfh)
-#else
-HIDE_BSD(nosys)
-#endif
 HIDE_BSD(getdomainname)
 HIDE_BSD(setdomainname)
 HIDE_BSD(uname)
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index d7c3cfdbd6ed1..8ddfe85d29afa 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.master,v 1.43 1997/09/14 16:51:14 phk Exp 
+ * created from	Id: syscalls.master,v 1.44 1997/10/26 20:27:51 phk Exp 
  */
 
 #define	SYS_syscall	0
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index da636570622f6..446d14103cada 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -2,7 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.master,v 1.43 1997/09/14 16:51:14 phk Exp 
+ * created from	Id: syscalls.master,v 1.44 1997/10/26 20:27:51 phk Exp 
  */
 
 #ifndef _SYS_SYSPROTO_H_
@@ -480,13 +480,10 @@ struct	quotactl_args {
 struct	oquota_args {
 	int dummy;
 };
-#ifdef NFS
 struct	nfssvc_args {
 	int flag;
 	caddr_t argp;
 };
-#else
-#endif
 struct	statfs_args {
 	char * path;
 	struct statfs * buf;
@@ -495,13 +492,10 @@ struct	fstatfs_args {
 	int fd;
 	struct statfs * buf;
 };
-#if defined(NFS) && !defined (NFS_NOSERVER)
 struct	getfh_args {
 	char * fname;
 	struct fhandle * fhp;
 };
-#else
-#endif
 struct	getdomainname_args {
 	char * domainname;
 	int len;
@@ -957,16 +951,10 @@ int	utimes __P((struct proc *, struct utimes_args *, int []));
 int	adjtime __P((struct proc *, struct adjtime_args *, int []));
 int	setsid __P((struct proc *, struct setsid_args *, int []));
 int	quotactl __P((struct proc *, struct quotactl_args *, int []));
-#ifdef NFS
 int	nfssvc __P((struct proc *, struct nfssvc_args *, int []));
-#else
-#endif
 int	statfs __P((struct proc *, struct statfs_args *, int []));
 int	fstatfs __P((struct proc *, struct fstatfs_args *, int []));
-#if defined(NFS) && !defined (NFS_NOSERVER)
 int	getfh __P((struct proc *, struct getfh_args *, int []));
-#else
-#endif
 int	getdomainname __P((struct proc *, struct getdomainname_args *, int []));
 int	setdomainname __P((struct proc *, struct setdomainname_args *, int []));
 int	uname __P((struct proc *, struct uname_args *, int []));
@@ -1163,18 +1151,12 @@ struct	okillpg_args {
 	int pgid;
 	int signum;
 };
-#ifdef NFS
-#else
-#endif
 struct	ogetdirentries_args {
 	int fd;
 	char * buf;
 	u_int count;
 	long * basep;
 };
-#if defined(NFS) && !defined (NFS_NOSERVER)
-#else
-#endif
 #ifdef LFS
 #else
 #endif