diff --git a/sys/arch/amigappc/amigappc/machdep.c b/sys/arch/amigappc/amigappc/machdep.c
index a3f33a2ccf81..a890c179f4b0 100644
--- a/sys/arch/amigappc/amigappc/machdep.c
+++ b/sys/arch/amigappc/amigappc/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.13 2001/07/22 14:09:04 wiz Exp $ */
+/* $NetBSD: machdep.c,v 1.14 2001/08/24 04:34:25 chs Exp $ */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -799,9 +799,8 @@ cpu_startup()
 				panic("cpu_startup: not enough memory for "
 					"buffer cache");
 			}
-			pmap_enter(kernel_map->pmap, curbuf,
-				VM_PAGE_TO_PHYS(pg), VM_PROT_READ|VM_PROT_WRITE,
-				VM_PROT_READ|VM_PROT_WRITE|PMAP_WIRED);
+			pmap_kenter_pa(curbuf, VM_PAGE_TO_PHYS(pg),
+			    VM_PROT_READ | VM_PROT_WRITE);
 			curbuf += PAGE_SIZE;
 			curbufsize -= PAGE_SIZE;
 		}
diff --git a/sys/arch/atari/atari/machdep.c b/sys/arch/atari/atari/machdep.c
index 0d54d7425bb8..39edfeeab569 100644
--- a/sys/arch/atari/atari/machdep.c
+++ b/sys/arch/atari/atari/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.110 2001/06/02 18:09:11 chs Exp $	*/
+/*	$NetBSD: machdep.c,v 1.111 2001/08/24 04:34:25 chs Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -260,9 +260,8 @@ cpu_startup()
 			if (pg == NULL) 
 				panic("cpu_startup: not enough memory for "
 				    "buffer cache");
-			pmap_enter(kernel_map->pmap, curbuf,
-			    VM_PAGE_TO_PHYS(pg), VM_PROT_READ|VM_PROT_WRITE,
-			    VM_PROT_READ|VM_PROT_WRITE|PMAP_WIRED);
+			pmap_kenter_pa(curbuf, VM_PAGE_TO_PHYS(pg),
+			    VM_PROT_READ | VM_PROT_WRITE);
 			curbuf += PAGE_SIZE;
 			curbufsize -= PAGE_SIZE;
 		}
diff --git a/sys/arch/bebox/bebox/machdep.c b/sys/arch/bebox/bebox/machdep.c
index 7435b7826a0e..f154c5ec6c48 100644
--- a/sys/arch/bebox/bebox/machdep.c
+++ b/sys/arch/bebox/bebox/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.64 2001/07/22 14:34:36 wiz Exp $	*/
+/*	$NetBSD: machdep.c,v 1.65 2001/08/24 04:34:26 chs Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -530,9 +530,8 @@ cpu_startup()
 			if (pg == NULL)
 				panic("startup: not enough memory for "
 					"buffer cache");
-			pmap_enter(kernel_map->pmap, curbuf,
-			    VM_PAGE_TO_PHYS(pg), VM_PROT_READ|VM_PROT_WRITE,
-			    VM_PROT_READ|VM_PROT_WRITE|PMAP_WIRED);
+			pmap_kenter_pa(curbuf, VM_PAGE_TO_PHYS(pg),
+			    VM_PROT_READ | VM_PROT_WRITE);
 			curbuf += PAGE_SIZE;
 			curbufsize -= PAGE_SIZE;
 		}
diff --git a/sys/arch/ofppc/ofppc/machdep.c b/sys/arch/ofppc/ofppc/machdep.c
index 9f2af74de895..5cf51dfa9010 100644
--- a/sys/arch/ofppc/ofppc/machdep.c
+++ b/sys/arch/ofppc/ofppc/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.66 2001/07/22 14:43:14 wiz Exp $	*/
+/*	$NetBSD: machdep.c,v 1.67 2001/08/24 04:34:26 chs Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -429,9 +429,8 @@ cpu_startup()
 			if (pg == NULL)
 				panic("startup: not enough memory for "
 					"buffer cache");
-			pmap_enter(kernel_map->pmap, curbuf,
-			    VM_PAGE_TO_PHYS(pg), VM_PROT_READ|VM_PROT_WRITE,
-			    VM_PROT_READ|VM_PROT_WRITE|PMAP_WIRED);
+			pmap_kenter_pa(curbuf, VM_PAGE_TO_PHYS(pg),
+			    VM_PROT_READ | VM_PROT_WRITE);
 			curbuf += PAGE_SIZE;
 			curbufsize -= PAGE_SIZE;
 		}
diff --git a/sys/arch/prep/prep/machdep.c b/sys/arch/prep/prep/machdep.c
index 040c716ec839..4dcb406378f3 100644
--- a/sys/arch/prep/prep/machdep.c
+++ b/sys/arch/prep/prep/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.24 2001/07/22 14:58:20 wiz Exp $	*/
+/*	$NetBSD: machdep.c,v 1.25 2001/08/24 04:34:26 chs Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -540,9 +540,8 @@ cpu_startup()
 			if (pg == NULL)
 				panic("startup: not enough memory for "
 					"buffer cache");
-			pmap_enter(kernel_map->pmap, curbuf,
-			    VM_PAGE_TO_PHYS(pg), VM_PROT_READ|VM_PROT_WRITE,
-			    VM_PROT_READ|VM_PROT_WRITE|PMAP_WIRED);
+			pmap_kenter_pa(curbuf, VM_PAGE_TO_PHYS(pg),
+			    VM_PROT_READ | VM_PROT_WRITE);
 			curbuf += PAGE_SIZE;
 			curbufsize -= PAGE_SIZE;
 		}
diff --git a/sys/arch/sandpoint/sandpoint/machdep.c b/sys/arch/sandpoint/sandpoint/machdep.c
index 064ca05c9290..48b03575c33b 100644
--- a/sys/arch/sandpoint/sandpoint/machdep.c
+++ b/sys/arch/sandpoint/sandpoint/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.12 2001/07/22 15:04:01 wiz Exp $	*/
+/*	$NetBSD: machdep.c,v 1.13 2001/08/24 04:34:26 chs Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -479,9 +479,8 @@ cpu_startup()
 			if (pg == NULL)
 				panic("startup: not enough memory for "
 					"buffer cache");
-			pmap_enter(kernel_map->pmap, curbuf,
-			    VM_PAGE_TO_PHYS(pg), VM_PROT_READ|VM_PROT_WRITE,
-			    VM_PROT_READ|VM_PROT_WRITE|PMAP_WIRED);
+			pmap_kenter_pa(curbuf, VM_PAGE_TO_PHYS(pg),
+			    VM_PROT_READ | VM_PROT_WRITE);
 			curbuf += PAGE_SIZE;
 			curbufsize -= PAGE_SIZE;
 		}
diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c
index 559b859c31f5..39ccc4cce031 100644
--- a/sys/arch/sparc64/sparc64/machdep.c
+++ b/sys/arch/sparc64/sparc64/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */
+/*	$NetBSD: machdep.c,v 1.109 2001/08/24 04:34:27 chs Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -294,9 +294,8 @@ cpu_startup()
 			if (pg == NULL)
 				panic("cpu_startup: "
 				    "not enough RAM for buffer cache");
-			pmap_enter(kernel_map->pmap, curbuf,
-			    VM_PAGE_TO_PHYS(pg), VM_PROT_READ|VM_PROT_WRITE,
-			    VM_PROT_READ|VM_PROT_WRITE|PMAP_WIRED);
+			pmap_kenter_pa(curbuf, VM_PAGE_TO_PHYS(pg),
+			    VM_PROT_READ | VM_PROT_WRITE);
 			curbuf += PAGE_SIZE;
 			curbufsize -= PAGE_SIZE;
 		}
diff --git a/sys/arch/sparc64/sparc64/vm_machdep.c b/sys/arch/sparc64/sparc64/vm_machdep.c
index b08cdec3dd10..fb41824e44b0 100644
--- a/sys/arch/sparc64/sparc64/vm_machdep.c
+++ b/sys/arch/sparc64/sparc64/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.39 2001/08/19 18:08:31 chs Exp $ */
+/*	$NetBSD: vm_machdep.c,v 1.40 2001/08/24 04:34:27 chs Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -89,11 +89,8 @@ pagemove(from, to, size)
 	while (size > 0) {
 		if (pmap_extract(pmap_kernel(), (vaddr_t)from, &pa) == FALSE)
 			panic("pagemove 2");
-		pmap_remove(pmap_kernel(),
-		    (vaddr_t)from, (vaddr_t)from + PAGE_SIZE);
-		pmap_enter(pmap_kernel(),
-		    (vaddr_t)to, pa, VM_PROT_READ|VM_PROT_WRITE,
-		    VM_PROT_READ|VM_PROT_WRITE|PMAP_WIRED);
+		pmap_kremove((vaddr_t)from, PAGE_SIZE);
+		pmap_kenter_pa((vaddr_t)to, pa, VM_PROT_READ | VM_PROT_WRITE);
 		from += PAGE_SIZE;
 		to += PAGE_SIZE;
 		size -= PAGE_SIZE;
diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index 4dfd413998a6..c0728e4c71ab 100644
--- a/sys/arch/vax/vax/machdep.c
+++ b/sys/arch/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.118 2001/06/30 12:54:33 ragge Exp $	 */
+/* $NetBSD: machdep.c,v 1.119 2001/08/24 04:34:27 chs Exp $	 */
 
 /*
  * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
@@ -202,9 +202,8 @@ cpu_startup()
 			if (pg == NULL)
 				panic("cpu_startup: "
 				    "not enough RAM for buffer cache");
-			pmap_enter(kernel_map->pmap, curbuf,
-			    VM_PAGE_TO_PHYS(pg), VM_PROT_READ|VM_PROT_WRITE,
-			    VM_PROT_READ|VM_PROT_WRITE|PMAP_WIRED);
+			pmap_kenter_pa(curbuf, VM_PAGE_TO_PHYS(pg),
+			    VM_PROT_READ | VM_PROT_WRITE);
 			curbuf += NBPG;
 			curbufsize -= NBPG;
 		}
diff --git a/sys/arch/walnut/walnut/machdep.c b/sys/arch/walnut/walnut/machdep.c
index 271deefd5b1d..15ab6ec0cc38 100644
--- a/sys/arch/walnut/walnut/machdep.c
+++ b/sys/arch/walnut/walnut/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.3 2001/07/22 15:09:10 wiz Exp $	*/
+/*	$NetBSD: machdep.c,v 1.4 2001/08/24 04:34:27 chs Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -423,9 +423,8 @@ cpu_startup(void)
 			if (pg == NULL)
 				panic("cpu_startup: not enough memory for "
 				    "buffer cache");
-			pmap_enter(kernel_map->pmap, curbuf,
-			    VM_PAGE_TO_PHYS(pg), VM_PROT_READ|VM_PROT_WRITE,
-			    VM_PROT_READ|VM_PROT_WRITE|PMAP_WIRED);
+			pmap_kenter_pa(curbuf, VM_PAGE_TO_PHYS(pg),
+			    VM_PROT_READ | VM_PROT_WRITE);
 			curbuf += PAGE_SIZE;
 			curbufsize -= PAGE_SIZE;
 		}