Index: sys/kern/kern_malloc.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/kern_malloc.c,v
retrieving revision 1.83
diff -u -r1.83 kern_malloc.c
--- sys/kern/kern_malloc.c	2001/02/09 06:09:50	1.83
+++ sys/kern/kern_malloc.c	2001/04/18 23:49:19
@@ -475,8 +475,8 @@
 	if ((vm_kmem_size / 2) > (cnt.v_page_count * PAGE_SIZE))
 		vm_kmem_size = 2 * cnt.v_page_count * PAGE_SIZE;
 
-	npg = (nmbufs * MSIZE + nmbclusters * MCLBYTES + vm_kmem_size)
-		/ PAGE_SIZE;
+	npg = (nmbufs * MSIZE + nmbclusters * MCLBYTES + nmbcnt *
+	    sizeof(union mext_refcnt) + vm_kmem_size) / PAGE_SIZE;
 
 	kmemusage = (struct kmemusage *) kmem_alloc(kernel_map,
 		(vm_size_t)(npg * sizeof(struct kmemusage)));
Index: sys/kern/uipc_mbuf.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/uipc_mbuf.c,v
retrieving revision 1.73
diff -u -r1.73 uipc_mbuf.c
--- sys/kern/uipc_mbuf.c	2001/04/03 04:50:08	1.73
+++ sys/kern/uipc_mbuf.c	2001/04/18 23:49:19
@@ -121,14 +121,15 @@
 static void
 mbinit(void *dummy)
 {
-	vm_offset_t maxaddr, mb_map_size;
+	vm_offset_t maxaddr;
+	vm_size_t mb_map_size;
 
 	/*
 	 * Setup the mb_map, allocate requested VM space.
 	 */
-	mb_map_size = nmbufs * MSIZE + nmbclusters * MCLBYTES + nmbcnt
-	    * sizeof(union mext_refcnt);
-	mb_map_size = roundup2(mb_map_size, PAGE_SIZE);
+	mb_map_size = (vm_size_t)(nmbufs * MSIZE + nmbclusters * MCLBYTES +
+	    nmbcnt * sizeof(union mext_refcnt));
+	mb_map_size = rounddown(mb_map_size, PAGE_SIZE);
 	mb_map = kmem_suballoc(kmem_map, (vm_offset_t *)&mbutl, &maxaddr,
 	    mb_map_size);
 	/* XXX XXX XXX: mb_map->system_map = 1; */
Index: sys/sys/mbuf.h
===================================================================
RCS file: /home/ncvs/src/sys/sys/mbuf.h,v
retrieving revision 1.76
diff -u -r1.76 mbuf.h
--- sys/sys/mbuf.h	2001/04/05 03:55:27	1.76
+++ sys/sys/mbuf.h	2001/04/18 23:49:19
@@ -666,6 +666,7 @@
 extern	struct mcntfree_lst	mcntfree;
 extern	struct mbffree_lst	mmbfree;
 extern	int		 nmbclusters;
+extern	int		 nmbcnt;
 extern	int		 nmbufs;
 extern	int		 nsfbufs;