Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/kern/subr_pool.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/subr_pool.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.17
retrieving revision 1.19
diff -u -p -r1.17 -r1.19
--- src/sys/kern/subr_pool.c	1998/12/27 21:13:43	1.17
+++ src/sys/kern/subr_pool.c	1999/03/24 05:51:25	1.19
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_pool.c,v 1.17 1998/12/27 21:13:43 thorpej Exp $	*/
+/*	$NetBSD: subr_pool.c,v 1.19 1999/03/24 05:51:25 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -48,9 +48,7 @@
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
 
-#if defined(UVM)
 #include <uvm/uvm.h>
-#endif  
 
 /*
  * Pool resource management utility.
@@ -723,7 +721,7 @@ pool_prime(pp, n, storage)
 	(void)lockmgr(&pp->pr_resourcelock, LK_EXCLUSIVE, NULL);
 	newnitems = pp->pr_minitems + n;
 	newpages =
-		roundup(pp->pr_itemsperpage,newnitems) / pp->pr_itemsperpage
+		roundup(newnitems, pp->pr_itemsperpage) / pp->pr_itemsperpage
 		- pp->pr_minpages;
 
 	while (newpages-- > 0) {
@@ -841,7 +839,7 @@ pool_setlowat(pp, n)
 	pp->pr_minitems = n;
 	pp->pr_minpages = (n == 0)
 		? 0
-		: roundup(pp->pr_itemsperpage,n) / pp->pr_itemsperpage;
+		: roundup(n, pp->pr_itemsperpage) / pp->pr_itemsperpage;
 	(void)lockmgr(&pp->pr_resourcelock, LK_RELEASE, NULL);
 }
 
@@ -854,7 +852,7 @@ pool_sethiwat(pp, n)
 	(void)lockmgr(&pp->pr_resourcelock, LK_EXCLUSIVE, NULL);
 	pp->pr_maxpages = (n == 0)
 		? 0
-		: roundup(pp->pr_itemsperpage,n) / pp->pr_itemsperpage;
+		: roundup(n, pp->pr_itemsperpage) / pp->pr_itemsperpage;
 	(void)lockmgr(&pp->pr_resourcelock, LK_RELEASE, NULL);
 }
 
@@ -870,11 +868,7 @@ pool_page_alloc(sz, flags, mtype)
 {
 	boolean_t waitok = (flags & PR_WAITOK) ? TRUE : FALSE;
 
-#if defined(UVM)
 	return ((void *)uvm_km_alloc_poolpage(waitok));
-#else
-	return ((void *)kmem_alloc_poolpage(waitok));
-#endif
 }
 
 static void
@@ -884,11 +878,7 @@ pool_page_free(v, sz, mtype)
 	int mtype;
 {
 
-#if defined(UVM)
 	uvm_km_free_poolpage((vaddr_t)v);
-#else
-	kmem_free_poolpage((vaddr_t)v);
-#endif  
 }
 
 /*
@@ -901,7 +891,6 @@ pool_page_alloc_nointr(sz, flags, mtype)
 	int flags;
 	int mtype;
 {
-#if defined(UVM)
 	boolean_t waitok = (flags & PR_WAITOK) ? TRUE : FALSE;
 
 	/*
@@ -909,12 +898,6 @@ pool_page_alloc_nointr(sz, flags, mtype)
 	 */
 	return ((void *)uvm_km_alloc_poolpage1(kernel_map, uvm.kernel_object,
 	    waitok));
-#else
-	/*
-	 * Can't do anything so cool with Mach VM.
-	 */
-	return (pool_page_alloc(sz, flags, mtype));
-#endif
 }
 
 void
@@ -924,11 +907,7 @@ pool_page_free_nointr(v, sz, mtype)
 	int mtype;
 {
 
-#if defined(UVM)
 	uvm_km_free_poolpage1(kernel_map, (vaddr_t)v);
-#else
-	pool_page_free(v, sz, mtype);
-#endif  
 }