5 files changed, 6 insertions, 21 deletions

diff --git a/sys/conf/files b/sys/conf/files
index b6177a3b1401..f543378b2f9a 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -56,6 +56,7 @@ kern/kern_lockf.c	standard
 kern/kern_malloc.c	standard
 kern/kern_mib.c		standard
 kern/kern_ntptime.c	standard
+kern/kern_opt.c		standard
 kern/kern_physio.c	standard
 kern/kern_proc.c	standard
 kern/kern_prot.c	standard
diff --git a/sys/conf/param.c b/sys/conf/param.c
index fe13eab70b7e..c37bcd8ceb1f 100644
--- a/sys/conf/param.c
+++ b/sys/conf/param.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.c	8.3 (Berkeley) 8/20/94
- * $Id: param.c,v 1.20 1996/05/31 00:20:29 peter Exp $
+ * $Id: param.c,v 1.20.2.1 1997/01/17 19:28:20 davidg Exp $
  */
 
 #include "opt_sysvipc.h"
@@ -89,11 +89,6 @@ int	maxfiles = NPROC*2;			/* system wide open files limit */
 int	maxfilesperproc = NPROC*2;		/* per-process open files limit */
 int	ncallout = 16 + NPROC;			/* maximum # of timer events */
 
-#ifndef EXTRAVNODES
-#define EXTRAVNODES 0
-#endif
-int	extravnodes = EXTRAVNODES;		/* spare vnodes to allocate */
-
 /* maximum # of mbuf clusters */
 #ifndef NMBCLUSTERS
 #define	NMBCLUSTERS (512 + MAXUSERS * 16)
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 48aafe806bc1..1aedc539e740 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.286.2.13 1997/02/08 15:42:25 joerg Exp $
+#	$Id: LINT,v 1.286.2.14 1997/02/22 20:31:26 joerg Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -61,16 +61,6 @@ options		"MAXDSIZ=(256*1024*1024)"
 options		"DFLDSIZ=(256*1024*1024)"
 
 #
-# Under some circumstances it is useful to have an extra number of
-# vnode data structures allocated at boot time.  In particular,
-# usenet news servers can benefit if there are enough vnodes to
-# cache the busiest newsgroup and overview directories.  Beware that
-# this is an expensive option, it consumes physical non-pageable ram.
-# A busy news server may benefit from 10,000 extra vnodes or so.
-#
-options		EXTRAVNODES=1
-
-#
 # A math emulator is mandatory if you wish to run on hardware which
 # does not have a floating-point processor.  Pick either the original,
 # bogus (but freely-distributable) math emulator, or a much more
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index ae27ae2b8122..d11642f32617 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.13 (Berkeley) 4/18/94
- * $Id: vfs_subr.c,v 1.64 1996/10/28 11:34:57 phk Exp $
+ * $Id: vfs_subr.c,v 1.64.2.1 1996/11/12 11:28:36 phk Exp $
  */
 
 /*
@@ -115,8 +115,8 @@ static int	vfs_hang_addrlist __P((struct mount *mp, struct netexport *nep,
 void
 vntblinit()
 {
-	desiredvnodes = maxproc + vm_object_cache_max + extravnodes;
 
+	desiredvnodes = maxproc + vm_object_cache_max;
 	TAILQ_INIT(&vnode_free_list);
 	CIRCLEQ_INIT(&mountlist);
 }
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index fdf0b9af76af..4728d650c80d 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode.h	8.7 (Berkeley) 2/4/94
- * $Id: vnode.h,v 1.35 1996/10/15 19:22:46 bde Exp $
+ * $Id: vnode.h,v 1.36 1996/10/17 17:12:04 jkh Exp $
  */
 
 #ifndef _SYS_VNODE_H_
@@ -230,7 +230,6 @@ void	vhold __P((struct vnode *));
  */
 extern	struct vnode *rootvnode;	/* root (i.e. "/") vnode */
 extern	int desiredvnodes;		/* number of vnodes desired */
-extern	int extravnodes;		/* extra vnodes to allocate at boot */
 extern	int prtactive;			/* nonzero to call vprint() */
 extern	struct vattr va_null;		/* predefined null vattr structure */