Move the initialisation/tuning of nmbclusters from param.c/machdep.c

into uipc_mbuf.c.  This reduces three sets of identical tunable code to
one set, and puts the initialisation with the mbuf code proper.

Make NMBUFs tunable as well.

Move the nmbclusters sysctl here as well.

Move the initialisation of maxsockets from param.c to uipc_socket2.c,
next to its corresponding sysctl.

Use the new tunable macros for the kern.vm.kmem.size tunable (this should have
been in a separate commit, whoops).

1 files changed, 1 insertions, 17 deletions

diff --git a/sys/conf/param.c b/sys/conf/param.c
index ce003d93476c..b9a906281f18 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.32 1998/12/14 08:34:54 dillon Exp $
+ * $Id: param.c,v 1.33 1999/04/09 16:28:11 des Exp $
  */
 
 #include <stddef.h>
@@ -83,22 +83,6 @@ int	maxfiles = MAXFILES;			/* system wide open files limit */
 int	maxfilesperproc = MAXFILES;		/* per-process open files limit */
 int	ncallout = 16 + NPROC + MAXFILES;	/* maximum # of timer events */
 
-/* maximum # of mbuf clusters */
-#ifndef NMBCLUSTERS
-#define	NMBCLUSTERS (512 + MAXUSERS * 16)
-#endif
-int	nmbclusters = NMBCLUSTERS;
-
-#if MAXFILES > NMBCLUSTERS
-#define	MAXSOCKETS MAXFILES
-#else
-#define	MAXSOCKETS NMBCLUSTERS
-#endif
-int	maxsockets = MAXSOCKETS;
-
-/* allocate 1/4th amount of virtual address space for mbufs XXX */
-int	nmbufs = NMBCLUSTERS * 4;
-
 /* maximum # of sf_bufs (sendfile(2) zero-copy virtual buffers) */
 #ifndef NSFBUFS
 #define	NSFBUFS (512 + MAXUSERS * 16)