From 28d898391b4492ff8f5a5e6b64f142c5942f1a95 Mon Sep 17 00:00:00 2001
From: mrg <mrg@NetBSD.org>
Date: Thu, 29 Jun 2000 08:10:45 +0000
Subject: [PATCH] remove include of <vm/vm.h>. <vm/vm.h> -> <uvm/uvm_extern.h>

---
 sys/arch/hpcmips/dev/bivideo.c            | 6 +++---
 sys/arch/hpcmips/dev/hpcfb.c              | 6 +++---
 sys/arch/hpcmips/dev/plumohci.c           | 4 ++--
 sys/arch/hpcmips/dev/plumvideo.c          | 4 ++--
 sys/arch/hpcmips/hpcmips/bus_dma.c        | 4 +---
 sys/arch/hpcmips/hpcmips/bus_space.c      | 6 ++----
 sys/arch/hpcmips/hpcmips/machdep.c        | 6 ++----
 sys/arch/hpcmips/tx/tx3912video.c         | 5 +++--
 sys/arch/luna68k/dev/lunafb.c             | 6 +++---
 sys/arch/luna68k/luna68k/db_memrw.c       | 8 ++++----
 sys/arch/luna68k/luna68k/genassym.cf      | 4 +---
 sys/arch/luna68k/luna68k/isr.c            | 8 +++-----
 sys/arch/luna68k/luna68k/machdep.c        | 6 ++----
 sys/arch/luna68k/luna68k/mem.c            | 8 +++-----
 sys/arch/luna68k/luna68k/pmap.c           | 4 +---
 sys/arch/luna68k/luna68k/pmap_bootstrap.c | 6 +++---
 sys/arch/luna68k/luna68k/sys_machdep.c    | 6 +++---
 sys/arch/luna68k/luna68k/trap.c           | 6 ++----
 sys/arch/luna68k/luna68k/vm_machdep.c     | 8 +++-----
 sys/arch/m68k/m68k/db_interface.c         | 4 ++--
 sys/arch/m68k/m68k/db_memrw.c             | 4 ++--
 sys/arch/m68k/m68k/mappedcopy.c           | 3 +--
 sys/arch/m68k/m68k/svr4_machdep.c         | 4 ++--
 sys/arch/mac68k/dev/grf_compat.c          | 3 +--
 sys/arch/mac68k/dev/if_mc.c               | 4 ++--
 sys/arch/mac68k/dev/if_sn.c               | 4 ++--
 sys/arch/mac68k/mac68k/bus_space.c        | 4 +---
 sys/arch/mac68k/mac68k/genassym.cf        | 4 +---
 sys/arch/mac68k/mac68k/intr.c             | 4 +---
 sys/arch/mac68k/mac68k/kgdb_machdep.c     | 4 ++--
 sys/arch/mac68k/mac68k/machdep.c          | 4 +---
 sys/arch/mac68k/mac68k/macrom.c           | 4 ++--
 sys/arch/mac68k/mac68k/mem.c              | 4 +---
 sys/arch/mac68k/mac68k/pmap.c             | 4 +---
 sys/arch/mac68k/mac68k/pmap_bootstrap.c   | 4 ++--
 sys/arch/mac68k/mac68k/sys_machdep.c      | 4 ++--
 sys/arch/mac68k/mac68k/trap.c             | 4 +---
 sys/arch/mac68k/mac68k/vm_machdep.c       | 4 +---
 sys/arch/mac68k/nubus/nubus.c             | 4 ++--
 sys/arch/mac68k/obio/asc.c                | 4 ++--
 sys/arch/mac68k/obio/if_mc_obio.c         | 4 ++--
 sys/arch/macppc/dev/am79c950.c            | 4 ++--
 sys/arch/macppc/dev/dbdma.c               | 4 ++--
 sys/arch/macppc/dev/if_bm.c               | 4 ++--
 sys/arch/macppc/dev/if_gm.c               | 4 ++--
 sys/arch/macppc/dev/if_mc.c               | 4 ++--
 sys/arch/macppc/dev/mesh.c                | 4 ++--
 sys/arch/macppc/dev/ofb.c                 | 4 ++--
 sys/arch/macppc/dev/wdc_obio.c            | 4 ++--
 sys/arch/macppc/macppc/bus_dma.c          | 4 +---
 sys/arch/macppc/macppc/clock.c            | 4 +---
 sys/arch/macppc/macppc/extintr.c          | 4 ++--
 sys/arch/macppc/macppc/genassym.cf        | 4 ++--
 sys/arch/macppc/macppc/machdep.c          | 4 +---
 sys/arch/macppc/macppc/rbus_machdep.c     | 4 +---
 sys/arch/macppc/pci/pci_machdep.c         | 4 ++--
 sys/arch/mips/mips/cpu_exec.c             | 5 +++--
 sys/arch/mips/mips/db_interface.c         | 5 +++--
 sys/arch/mips/mips/genassym.cf            | 5 +----
 sys/arch/mips/mips/mem.c                  | 4 +---
 sys/arch/mips/mips/mips_machdep.c         | 6 ++----
 sys/arch/mips/mips/pmap.c                 | 6 ++----
 sys/arch/mips/mips/sys_machdep.c          | 5 +++--
 sys/arch/mips/mips/trap.c                 | 6 ++----
 sys/arch/mips/mips/vm_machdep.c           | 6 ++----
 65 files changed, 125 insertions(+), 180 deletions(-)

diff --git a/sys/arch/hpcmips/dev/bivideo.c b/sys/arch/hpcmips/dev/bivideo.c
index ed6076162a81..0c973e6666a4 100644
--- a/sys/arch/hpcmips/dev/bivideo.c
+++ b/sys/arch/hpcmips/dev/bivideo.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bivideo.c,v 1.7 2000/06/26 04:55:40 simonb Exp $	*/
+/*	$NetBSD: bivideo.c,v 1.8 2000/06/29 08:17:59 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1999
@@ -37,7 +37,7 @@
 static const char _copyright[] __attribute__ ((unused)) =
     "Copyright (c) 1999 Shin Takemura.  All rights reserved.";
 static const char _rcsid[] __attribute__ ((unused)) =
-    "$Id: bivideo.c,v 1.7 2000/06/26 04:55:40 simonb Exp $";
+    "$Id: bivideo.c,v 1.8 2000/06/29 08:17:59 mrg Exp $";
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -48,7 +48,7 @@ static const char _rcsid[] __attribute__ ((unused)) =
 #include <sys/buf.h>
 #include <sys/ioctl.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 #include <machine/autoconf.h>
diff --git a/sys/arch/hpcmips/dev/hpcfb.c b/sys/arch/hpcmips/dev/hpcfb.c
index 609aca0ffb04..30beef0c476b 100644
--- a/sys/arch/hpcmips/dev/hpcfb.c
+++ b/sys/arch/hpcmips/dev/hpcfb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpcfb.c,v 1.7 2000/06/26 04:55:41 simonb Exp $	*/
+/*	$NetBSD: hpcfb.c,v 1.8 2000/06/29 08:17:59 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1999
@@ -45,7 +45,7 @@
 static const char _copyright[] __attribute__ ((unused)) =
     "Copyright (c) 1999 Shin Takemura.  All rights reserved.";
 static const char _rcsid[] __attribute__ ((unused)) =
-    "$Id: hpcfb.c,v 1.7 2000/06/26 04:55:41 simonb Exp $";
+    "$Id: hpcfb.c,v 1.8 2000/06/29 08:17:59 mrg Exp $";
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -56,7 +56,7 @@ static const char _rcsid[] __attribute__ ((unused)) =
 #include <sys/buf.h>
 #include <sys/ioctl.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 #include <machine/autoconf.h>
diff --git a/sys/arch/hpcmips/dev/plumohci.c b/sys/arch/hpcmips/dev/plumohci.c
index bd84413a8851..9117badf4acc 100644
--- a/sys/arch/hpcmips/dev/plumohci.c
+++ b/sys/arch/hpcmips/dev/plumohci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: plumohci.c,v 1.2 2000/06/26 14:20:43 mrg Exp $ */
+/*	$NetBSD: plumohci.c,v 1.3 2000/06/29 08:17:59 mrg Exp $ */
 
 /*-
  * Copyright (c) 2000 UCHIYAMA Yasushi
@@ -43,7 +43,7 @@
 
 /* busdma */
 #include <sys/mbuf.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #define _HPCMIPS_BUS_DMA_PRIVATE
 #include <machine/bus.h>
diff --git a/sys/arch/hpcmips/dev/plumvideo.c b/sys/arch/hpcmips/dev/plumvideo.c
index 126385d4b3f7..553ecf709c7c 100644
--- a/sys/arch/hpcmips/dev/plumvideo.c
+++ b/sys/arch/hpcmips/dev/plumvideo.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: plumvideo.c,v 1.12 2000/06/26 04:55:41 simonb Exp $ */
+/*	$NetBSD: plumvideo.c,v 1.13 2000/06/29 08:17:59 mrg Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000 UCHIYAMA Yasushi.  All rights reserved.
@@ -35,7 +35,7 @@
 
 #include <sys/ioctl.h>
 #include <sys/buf.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <dev/cons.h> /* consdev */
 
diff --git a/sys/arch/hpcmips/hpcmips/bus_dma.c b/sys/arch/hpcmips/hpcmips/bus_dma.c
index 0246c0710aa9..bd13fe804c3c 100644
--- a/sys/arch/hpcmips/hpcmips/bus_dma.c
+++ b/sys/arch/hpcmips/hpcmips/bus_dma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_dma.c,v 1.3 2000/06/26 14:20:43 mrg Exp $	*/
+/*	$NetBSD: bus_dma.c,v 1.4 2000/06/29 08:17:59 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -41,8 +41,6 @@
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 #define _HPCMIPS_BUS_DMA_PRIVATE
diff --git a/sys/arch/hpcmips/hpcmips/bus_space.c b/sys/arch/hpcmips/hpcmips/bus_space.c
index cad3f351fa2f..d7f10a14ec66 100644
--- a/sys/arch/hpcmips/hpcmips/bus_space.c
+++ b/sys/arch/hpcmips/hpcmips/bus_space.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_space.c,v 1.5 2000/06/26 14:20:43 mrg Exp $	*/
+/*	$NetBSD: bus_space.c,v 1.6 2000/06/29 08:17:59 mrg Exp $	*/
 
 /*
  * Copyright (c) 1999, by UCHIYAMA Yasushi
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  */
-/*	$NetBSD: bus_space.c,v 1.5 2000/06/26 14:20:43 mrg Exp $	*/
+/*	$NetBSD: bus_space.c,v 1.6 2000/06/29 08:17:59 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -70,8 +70,6 @@
 #include <sys/map.h>
 #include <sys/extent.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 #include <mips/cpuregs.h>
diff --git a/sys/arch/hpcmips/hpcmips/machdep.c b/sys/arch/hpcmips/hpcmips/machdep.c
index 399ae166e2df..5b7090037a82 100644
--- a/sys/arch/hpcmips/hpcmips/machdep.c
+++ b/sys/arch/hpcmips/hpcmips/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.27 2000/06/26 14:20:43 mrg Exp $	*/
+/*	$NetBSD: machdep.c,v 1.28 2000/06/29 08:17:59 mrg Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.27 2000/06/26 14:20:43 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.28 2000/06/29 08:17:59 mrg Exp $");
 
 /* from: Utah Hdr: machdep.c 1.63 91/04/24 */
 #include "opt_vr41x1.h"
@@ -72,8 +72,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.27 2000/06/26 14:20:43 mrg Exp $");
 #include <sys/syscallargs.h>
 #include <sys/kcore.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 #include <sys/sysctl.h>
diff --git a/sys/arch/hpcmips/tx/tx3912video.c b/sys/arch/hpcmips/tx/tx3912video.c
index de1aaee90b74..7adabb3317b8 100644
--- a/sys/arch/hpcmips/tx/tx3912video.c
+++ b/sys/arch/hpcmips/tx/tx3912video.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tx3912video.c,v 1.16 2000/06/26 04:55:43 simonb Exp $ */
+/*	$NetBSD: tx3912video.c,v 1.17 2000/06/29 08:18:00 mrg Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000 UCHIYAMA Yasushi.  All rights reserved.
@@ -37,7 +37,8 @@
 
 #include <sys/ioctl.h>
 #include <sys/buf.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 #include <machine/bootinfo.h>
diff --git a/sys/arch/luna68k/dev/lunafb.c b/sys/arch/luna68k/dev/lunafb.c
index 91f3780b77e5..17db0979f2d2 100644
--- a/sys/arch/luna68k/dev/lunafb.c
+++ b/sys/arch/luna68k/dev/lunafb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lunafb.c,v 1.5 2000/06/26 04:55:46 simonb Exp $ */
+/* $NetBSD: lunafb.c,v 1.6 2000/06/29 08:17:25 mrg Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.5 2000/06/26 04:55:46 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.6 2000/06/29 08:17:25 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.5 2000/06/26 04:55:46 simonb Exp $");
 #include <sys/tty.h>
 #include <sys/errno.h>
 #include <sys/buf.h>
-#include <vm/vm.h>
+
 #include <uvm/uvm_extern.h>
 
 #include <dev/rcons/raster.h>
diff --git a/sys/arch/luna68k/luna68k/db_memrw.c b/sys/arch/luna68k/luna68k/db_memrw.c
index 06e536f1b123..acefee5c6373 100644
--- a/sys/arch/luna68k/luna68k/db_memrw.c
+++ b/sys/arch/luna68k/luna68k/db_memrw.c
@@ -1,5 +1,5 @@
-/* $NetBSD: db_memrw.c,v 1.1 2000/01/05 08:49:03 nisimura Exp $ */
-/*	$NetBSD: db_memrw.c,v 1.1 2000/01/05 08:49:03 nisimura Exp $	*/
+/* $NetBSD: db_memrw.c,v 1.2 2000/06/29 08:17:26 mrg Exp $ */
+/*	$NetBSD: db_memrw.c,v 1.2 2000/06/29 08:17:26 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.1 2000/01/05 08:49:03 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.2 2000/06/29 08:17:26 mrg Exp $");
 
 /*
  * Interface to the debugger for virtual memory read/write.
@@ -64,7 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.1 2000/01/05 08:49:03 nisimura Exp $"
 #include <sys/systm.h>
 #include <sys/proc.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/pte.h>
 #include <machine/db_machdep.h>
diff --git a/sys/arch/luna68k/luna68k/genassym.cf b/sys/arch/luna68k/luna68k/genassym.cf
index da3276fb9f82..791c26f6dbef 100644
--- a/sys/arch/luna68k/luna68k/genassym.cf
+++ b/sys/arch/luna68k/luna68k/genassym.cf
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.2 2000/05/26 00:36:46 thorpej Exp $
+#	$NetBSD: genassym.cf,v 1.3 2000/06/29 08:17:26 mrg Exp $
 
 #
 # Copyright (c) 1982, 1990, 1993
@@ -46,8 +46,6 @@ include <sys/msgbuf.h>
 include <sys/syscall.h>
 include <sys/user.h>
 
-include <vm/vm.h>
-
 include <uvm/uvm_extern.h>
 
 ifdef COMPAT_SVR4
diff --git a/sys/arch/luna68k/luna68k/isr.c b/sys/arch/luna68k/luna68k/isr.c
index 6e1ccdf1b10a..4df6cc440594 100644
--- a/sys/arch/luna68k/luna68k/isr.c
+++ b/sys/arch/luna68k/luna68k/isr.c
@@ -1,5 +1,5 @@
-/* $NetBSD: isr.c,v 1.2 2000/02/21 20:38:48 erh Exp $ */
-/*	$NetBSD: isr.c,v 1.2 2000/02/21 20:38:48 erh Exp $	*/
+/* $NetBSD: isr.c,v 1.3 2000/06/29 08:17:26 mrg Exp $ */
+/*	$NetBSD: isr.c,v 1.3 2000/06/29 08:17:26 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.2 2000/02/21 20:38:48 erh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.3 2000/06/29 08:17:26 mrg Exp $");
 
 /*
  * Link and dispatch interrupts.
@@ -56,8 +56,6 @@ __KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.2 2000/02/21 20:38:48 erh Exp $");
 #include <sys/malloc.h>
 #include <sys/vmmeter.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 #include <net/netisr.h>
diff --git a/sys/arch/luna68k/luna68k/machdep.c b/sys/arch/luna68k/luna68k/machdep.c
index 89a2d04a8296..37f0ab079664 100644
--- a/sys/arch/luna68k/luna68k/machdep.c
+++ b/sys/arch/luna68k/luna68k/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.9 2000/06/26 14:20:46 mrg Exp $ */
+/* $NetBSD: machdep.c,v 1.10 2000/06/29 08:17:26 mrg Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.9 2000/06/26 14:20:46 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.10 2000/06/29 08:17:26 mrg Exp $");
 
 #include "opt_ddb.h"
 
@@ -69,8 +69,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.9 2000/06/26 14:20:46 mrg Exp $");
 #include <sys/kgdb.h>
 #endif
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 #include <sys/sysctl.h>
diff --git a/sys/arch/luna68k/luna68k/mem.c b/sys/arch/luna68k/luna68k/mem.c
index c56a1dc1bc7a..ba83da810bcf 100644
--- a/sys/arch/luna68k/luna68k/mem.c
+++ b/sys/arch/luna68k/luna68k/mem.c
@@ -1,5 +1,5 @@
-/* $NetBSD: mem.c,v 1.2 2000/06/26 04:55:46 simonb Exp $ */
-/*	$NetBSD: mem.c,v 1.2 2000/06/26 04:55:46 simonb Exp $	*/
+/* $NetBSD: mem.c,v 1.3 2000/06/29 08:17:26 mrg Exp $ */
+/*	$NetBSD: mem.c,v 1.3 2000/06/29 08:17:26 mrg Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.2 2000/06/26 04:55:46 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.3 2000/06/29 08:17:26 mrg Exp $");
 
 /*
  * Memory special file
@@ -59,8 +59,6 @@ __KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.2 2000/06/26 04:55:46 simonb Exp $");
 
 #include <machine/cpu.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 #define mmread  mmrw
diff --git a/sys/arch/luna68k/luna68k/pmap.c b/sys/arch/luna68k/luna68k/pmap.c
index fd0462e7e76c..2aa49b3c9ebd 100644
--- a/sys/arch/luna68k/luna68k/pmap.c
+++ b/sys/arch/luna68k/luna68k/pmap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.4 2000/06/26 14:20:46 mrg Exp $ */
+/* $NetBSD: pmap.c,v 1.5 2000/06/29 08:17:26 mrg Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -138,8 +138,6 @@
 #include <machine/vmparam.h>
 #include <machine/pte.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm.h>
 
 #include <machine/cpu.h>
diff --git a/sys/arch/luna68k/luna68k/pmap_bootstrap.c b/sys/arch/luna68k/luna68k/pmap_bootstrap.c
index 2cc66df11a02..b30a12039e18 100644
--- a/sys/arch/luna68k/luna68k/pmap_bootstrap.c
+++ b/sys/arch/luna68k/luna68k/pmap_bootstrap.c
@@ -1,5 +1,5 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.1 2000/01/05 08:49:03 nisimura Exp $ */
-/*	$NetBSD: pmap_bootstrap.c,v 1.1 2000/01/05 08:49:03 nisimura Exp $	*/
+/* $NetBSD: pmap_bootstrap.c,v 1.2 2000/06/29 08:17:26 mrg Exp $ */
+/*	$NetBSD: pmap_bootstrap.c,v 1.2 2000/06/29 08:17:26 mrg Exp $	*/
 
 /* 
  * Copyright (c) 1991, 1993
@@ -48,7 +48,7 @@
 #include <machine/vmparam.h>
 #include <machine/pte.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #define RELOC(v, t)	*((t*)((u_int)&(v) + firstpa))
 
diff --git a/sys/arch/luna68k/luna68k/sys_machdep.c b/sys/arch/luna68k/luna68k/sys_machdep.c
index 0e779f1790b7..eaa6e677a39d 100644
--- a/sys/arch/luna68k/luna68k/sys_machdep.c
+++ b/sys/arch/luna68k/luna68k/sys_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_machdep.c,v 1.2 2000/01/11 08:24:14 nisimura Exp $ */
+/* $NetBSD: sys_machdep.c,v 1.3 2000/06/29 08:17:26 mrg Exp $ */
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -37,7 +37,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.2 2000/01/11 08:24:14 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.3 2000/06/29 08:17:26 mrg Exp $");
 
 #include "opt_compat_hpux.h"
 
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.2 2000/01/11 08:24:14 nisimura Exp
 #include <sys/trace.h>
 #include <sys/mount.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <sys/syscallargs.h>
 
diff --git a/sys/arch/luna68k/luna68k/trap.c b/sys/arch/luna68k/luna68k/trap.c
index bde699c1d7e0..87a6fe16dd6d 100644
--- a/sys/arch/luna68k/luna68k/trap.c
+++ b/sys/arch/luna68k/luna68k/trap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.8 2000/06/27 04:18:57 mrg Exp $ */
+/* $NetBSD: trap.c,v 1.9 2000/06/29 08:17:26 mrg Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -44,7 +44,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.8 2000/06/27 04:18:57 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.9 2000/06/29 08:17:26 mrg Exp $");
 
 #include "opt_ddb.h"
 #include "opt_syscall_debug.h"
@@ -72,8 +72,6 @@ __KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.8 2000/06/27 04:18:57 mrg Exp $");
 #include <machine/reg.h>
 #include <machine/db_machdep.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 #include <dev/cons.h>
diff --git a/sys/arch/luna68k/luna68k/vm_machdep.c b/sys/arch/luna68k/luna68k/vm_machdep.c
index ce108cab0417..dea012911503 100644
--- a/sys/arch/luna68k/luna68k/vm_machdep.c
+++ b/sys/arch/luna68k/luna68k/vm_machdep.c
@@ -1,5 +1,5 @@
-/* $NetBSD: vm_machdep.c,v 1.4 2000/06/26 14:20:46 mrg Exp $ */
-/*	$NetBSD: vm_machdep.c,v 1.4 2000/06/26 14:20:46 mrg Exp $	*/
+/* $NetBSD: vm_machdep.c,v 1.5 2000/06/29 08:17:26 mrg Exp $ */
+/*	$NetBSD: vm_machdep.c,v 1.5 2000/06/29 08:17:26 mrg Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.4 2000/06/26 14:20:46 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.5 2000/06/29 08:17:26 mrg Exp $");
 
 #include "opt_compat_hpux.h"
 
@@ -58,8 +58,6 @@ __KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.4 2000/06/26 14:20:46 mrg Exp $");
 #include <sys/core.h>
 #include <sys/exec.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 #include <machine/cpu.h>
diff --git a/sys/arch/m68k/m68k/db_interface.c b/sys/arch/m68k/m68k/db_interface.c
index ee614666e705..6d2454a0c4d0 100644
--- a/sys/arch/m68k/m68k/db_interface.c
+++ b/sys/arch/m68k/m68k/db_interface.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_interface.c,v 1.26 1999/10/12 17:08:58 jdolecek Exp $	*/
+/*	$NetBSD: db_interface.c,v 1.27 2000/06/29 08:13:52 mrg Exp $	*/
 
 /* 
  * Mach Operating System
@@ -36,7 +36,7 @@
 #include <sys/reboot.h>
 #include <sys/systm.h> /* just for boothowto --eichin */
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <dev/cons.h>
 
diff --git a/sys/arch/m68k/m68k/db_memrw.c b/sys/arch/m68k/m68k/db_memrw.c
index 039340352f46..dd8aed08fb0d 100644
--- a/sys/arch/m68k/m68k/db_memrw.c
+++ b/sys/arch/m68k/m68k/db_memrw.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_memrw.c,v 1.2 1999/09/25 21:11:55 is Exp $	*/
+/*	$NetBSD: db_memrw.c,v 1.3 2000/06/29 08:13:52 mrg Exp $	*/
 
 /* 
  * Mach Operating System
@@ -40,7 +40,7 @@
 #include <sys/param.h>
 #include <sys/proc.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/db_machdep.h>
 
diff --git a/sys/arch/m68k/m68k/mappedcopy.c b/sys/arch/m68k/m68k/mappedcopy.c
index 690df5162dc5..6b54fbe7a4fd 100644
--- a/sys/arch/m68k/m68k/mappedcopy.c
+++ b/sys/arch/m68k/m68k/mappedcopy.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mappedcopy.c,v 1.11 2000/06/26 14:20:46 mrg Exp $	*/
+/*	$NetBSD: mappedcopy.c,v 1.12 2000/06/29 08:13:52 mrg Exp $	*/
 
 /*
  * XXX This doesn't work yet.  Soon.  --thorpej@netbsd.org
@@ -50,7 +50,6 @@
 #include <sys/systm.h>
 #include <sys/proc.h>
 
-#include <vm/vm.h>
 #include <uvm/uvm_extern.h>
 
 #include <machine/cpu.h>
diff --git a/sys/arch/m68k/m68k/svr4_machdep.c b/sys/arch/m68k/m68k/svr4_machdep.c
index af8db56efff0..4eee58f7fd67 100644
--- a/sys/arch/m68k/m68k/svr4_machdep.c
+++ b/sys/arch/m68k/m68k/svr4_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_machdep.c,v 1.2 1999/09/23 16:37:04 frueauf Exp $	*/
+/*	$NetBSD: svr4_machdep.c,v 1.3 2000/06/29 08:13:52 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
 #include <sys/syscallargs.h>
 #include <sys/exec_elf.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 #include <sys/sysctl.h>
 
 #include <compat/svr4/svr4_types.h>
diff --git a/sys/arch/mac68k/dev/grf_compat.c b/sys/arch/mac68k/dev/grf_compat.c
index 57b341789974..b6e474efc0b6 100644
--- a/sys/arch/mac68k/dev/grf_compat.c
+++ b/sys/arch/mac68k/dev/grf_compat.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf_compat.c,v 1.4 2000/06/26 04:55:46 simonb Exp $	*/
+/*	$NetBSD: grf_compat.c,v 1.5 2000/06/29 08:15:11 mrg Exp $	*/
 
 /*
  * Copyright (C) 1999 Scott Reynolds
@@ -54,7 +54,6 @@
 
 #include <miscfs/specfs/specdev.h>
 
-#include <vm/vm.h>
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_map.h>
 
diff --git a/sys/arch/mac68k/dev/if_mc.c b/sys/arch/mac68k/dev/if_mc.c
index 7e0169bf8da7..6820091fc308 100644
--- a/sys/arch/mac68k/dev/if_mc.c
+++ b/sys/arch/mac68k/dev/if_mc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_mc.c,v 1.15 1999/12/20 01:06:40 scottr Exp $	*/
+/*	$NetBSD: if_mc.c,v 1.16 2000/06/29 08:15:11 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1997 David Huang <khym@bga.com>
@@ -76,7 +76,7 @@
 #include <netccitt/pk_extern.h>
 #endif
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include "bpfilter.h"
 #if NBPFILTER > 0
diff --git a/sys/arch/mac68k/dev/if_sn.c b/sys/arch/mac68k/dev/if_sn.c
index b66cb667493f..ec68d6a9d6e2 100644
--- a/sys/arch/mac68k/dev/if_sn.c
+++ b/sys/arch/mac68k/dev/if_sn.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_sn.c,v 1.25 1999/12/12 08:18:48 scottr Exp $	*/
+/*	$NetBSD: if_sn.c,v 1.26 2000/06/29 08:15:11 mrg Exp $	*/
 
 /*
  * National Semiconductor  DP8393X SONIC Driver
@@ -40,7 +40,7 @@
 #include <netinet/if_inarp.h>
 #endif
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include "bpfilter.h"
 #if NBPFILTER > 0
diff --git a/sys/arch/mac68k/mac68k/bus_space.c b/sys/arch/mac68k/mac68k/bus_space.c
index 94af07e85a6d..04c30cc20cbe 100644
--- a/sys/arch/mac68k/mac68k/bus_space.c
+++ b/sys/arch/mac68k/mac68k/bus_space.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_space.c,v 1.9 2000/06/26 14:20:46 mrg Exp $	*/
+/*	$NetBSD: bus_space.c,v 1.10 2000/06/29 08:15:12 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -48,8 +48,6 @@
 
 #include <machine/bus.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 int	bus_mem_add_mapping __P((bus_addr_t, bus_size_t,
diff --git a/sys/arch/mac68k/mac68k/genassym.cf b/sys/arch/mac68k/mac68k/genassym.cf
index 0f15bbe2bccb..47a880d7b627 100644
--- a/sys/arch/mac68k/mac68k/genassym.cf
+++ b/sys/arch/mac68k/mac68k/genassym.cf
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.18 2000/05/26 00:36:46 thorpej Exp $
+#	$NetBSD: genassym.cf,v 1.19 2000/06/29 08:15:12 mrg Exp $
 
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -46,8 +46,6 @@ include	<sys/proc.h>
 include	<sys/syscall.h>
 include	<sys/user.h>
 
-include	<vm/vm.h>
-
 include <uvm/uvm_extern.h>
 
 ifdef COMPAT_SVR4
diff --git a/sys/arch/mac68k/mac68k/intr.c b/sys/arch/mac68k/mac68k/intr.c
index a796917e518b..09f734dd95c8 100644
--- a/sys/arch/mac68k/mac68k/intr.c
+++ b/sys/arch/mac68k/mac68k/intr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.c,v 1.13 2000/02/21 20:38:48 erh Exp $	*/
+/*	$NetBSD: intr.c,v 1.14 2000/06/29 08:15:12 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -51,8 +51,6 @@
 #include <sys/malloc.h>
 #include <sys/vmmeter.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 #include <net/netisr.h>
diff --git a/sys/arch/mac68k/mac68k/kgdb_machdep.c b/sys/arch/mac68k/mac68k/kgdb_machdep.c
index cb25e0785ed3..3a8813fdc9d9 100644
--- a/sys/arch/mac68k/mac68k/kgdb_machdep.c
+++ b/sys/arch/mac68k/mac68k/kgdb_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kgdb_machdep.c,v 1.3 1999/12/12 08:18:49 scottr Exp $	*/
+/*	$NetBSD: kgdb_machdep.c,v 1.4 2000/06/29 08:15:12 mrg Exp $	*/
 
 /*
  * Copyright (c) 1990, 1993
@@ -52,7 +52,7 @@
 #include <sys/systm.h>
 #include <sys/kgdb.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/db_machdep.h>
 #include <machine/pmap.h>
diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c
index 13cbad4de66c..e8e485dea3fe 100644
--- a/sys/arch/mac68k/mac68k/machdep.c
+++ b/sys/arch/mac68k/mac68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.253 2000/06/26 14:20:46 mrg Exp $	*/
+/*	$NetBSD: machdep.c,v 1.254 2000/06/29 08:15:12 mrg Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -123,8 +123,6 @@
 #include <net/netisr.h>
 
 #define	MAXMEM	64*1024	/* XXX - from cmap.h */
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 #include <sys/sysctl.h>		/* Requires vm/vm.h */
diff --git a/sys/arch/mac68k/mac68k/macrom.c b/sys/arch/mac68k/mac68k/macrom.c
index 25625fb2ab98..47bb457b0e70 100644
--- a/sys/arch/mac68k/mac68k/macrom.c
+++ b/sys/arch/mac68k/mac68k/macrom.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: macrom.c,v 1.45 2000/06/25 13:26:23 mrg Exp $	*/
+/*	$NetBSD: macrom.c,v 1.46 2000/06/29 08:15:12 mrg Exp $	*/
 
 /*-
  * Copyright (C) 1994	Bradley A. Grantham
@@ -54,7 +54,7 @@
 #include <sys/malloc.h>
 #include <sys/queue.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/cpu.h>
 #include <machine/frame.h>
diff --git a/sys/arch/mac68k/mac68k/mem.c b/sys/arch/mac68k/mac68k/mem.c
index 1ed54a11baeb..351f8bb8ec7e 100644
--- a/sys/arch/mac68k/mac68k/mem.c
+++ b/sys/arch/mac68k/mac68k/mem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem.c,v 1.26 2000/06/26 04:55:47 simonb Exp $	*/
+/*	$NetBSD: mem.c,v 1.27 2000/06/29 08:15:12 mrg Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -54,8 +54,6 @@
 
 #include <machine/cpu.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 extern u_long maxaddr;
diff --git a/sys/arch/mac68k/mac68k/pmap.c b/sys/arch/mac68k/mac68k/pmap.c
index 275340010c0b..2a6a6667af77 100644
--- a/sys/arch/mac68k/mac68k/pmap.c
+++ b/sys/arch/mac68k/mac68k/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.66 2000/06/26 14:20:47 mrg Exp $	*/
+/*	$NetBSD: pmap.c,v 1.67 2000/06/29 08:15:12 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -138,8 +138,6 @@
 
 #include <machine/pte.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm.h>
 
 #include <machine/cpu.h>
diff --git a/sys/arch/mac68k/mac68k/pmap_bootstrap.c b/sys/arch/mac68k/mac68k/pmap_bootstrap.c
index 9658fd7286f6..6c635e65022d 100644
--- a/sys/arch/mac68k/mac68k/pmap_bootstrap.c
+++ b/sys/arch/mac68k/mac68k/pmap_bootstrap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.53 2000/02/14 07:01:49 scottr Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.54 2000/06/29 08:15:13 mrg Exp $	*/
 
 /* 
  * Copyright (c) 1991, 1993
@@ -46,7 +46,7 @@
 #include <sys/systm.h>
 #include <sys/reboot.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/pte.h>
 #include <mac68k/mac68k/clockreg.h>
diff --git a/sys/arch/mac68k/mac68k/sys_machdep.c b/sys/arch/mac68k/mac68k/sys_machdep.c
index bff6b4c2d45a..b401ce7d6759 100644
--- a/sys/arch/mac68k/mac68k/sys_machdep.c
+++ b/sys/arch/mac68k/mac68k/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_machdep.c,v 1.16 1999/12/12 08:18:49 scottr Exp $	*/
+/*	$NetBSD: sys_machdep.c,v 1.17 2000/06/29 08:15:13 mrg Exp $	*/
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -81,7 +81,7 @@
 #include <sys/trace.h>
 #include <sys/mount.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <sys/syscallargs.h>
 
diff --git a/sys/arch/mac68k/mac68k/trap.c b/sys/arch/mac68k/mac68k/trap.c
index 7e2d013ad136..390ea4680149 100644
--- a/sys/arch/mac68k/mac68k/trap.c
+++ b/sys/arch/mac68k/mac68k/trap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.83 2000/06/27 04:18:58 mrg Exp $	*/
+/*	$NetBSD: trap.c,v 1.84 2000/06/29 08:15:13 mrg Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -78,8 +78,6 @@
 
 #include <m68k/fpe/fpu_emulate.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 #include "zsc.h"
diff --git a/sys/arch/mac68k/mac68k/vm_machdep.c b/sys/arch/mac68k/mac68k/vm_machdep.c
index d362b7293799..befe361c96ad 100644
--- a/sys/arch/mac68k/mac68k/vm_machdep.c
+++ b/sys/arch/mac68k/mac68k/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.47 2000/06/26 14:20:47 mrg Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.48 2000/06/29 08:15:13 mrg Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -57,8 +57,6 @@
 #include <machine/pte.h>
 #include <machine/reg.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 /*
diff --git a/sys/arch/mac68k/nubus/nubus.c b/sys/arch/mac68k/nubus/nubus.c
index 95b63f5ebd50..fb9fe2afd904 100644
--- a/sys/arch/mac68k/nubus/nubus.c
+++ b/sys/arch/mac68k/nubus/nubus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nubus.c,v 1.48 2000/06/26 14:20:47 mrg Exp $	*/
+/*	$NetBSD: nubus.c,v 1.49 2000/06/29 08:15:13 mrg Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996 Allen Briggs.  All rights reserved.
@@ -35,7 +35,7 @@
 #include <sys/buf.h>
 #include <sys/conf.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 #include <machine/bus.h>
diff --git a/sys/arch/mac68k/obio/asc.c b/sys/arch/mac68k/obio/asc.c
index fb416c2470a8..373ebc9ed0e4 100644
--- a/sys/arch/mac68k/obio/asc.c
+++ b/sys/arch/mac68k/obio/asc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: asc.c,v 1.36 2000/06/27 04:19:01 mrg Exp $	*/
+/*	$NetBSD: asc.c,v 1.37 2000/06/29 08:15:14 mrg Exp $	*/
 
 /*
  * Copyright (C) 1997 Scott Reynolds
@@ -72,7 +72,7 @@
 #include <sys/device.h>
 #include <sys/poll.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 #include <machine/cpu.h>
diff --git a/sys/arch/mac68k/obio/if_mc_obio.c b/sys/arch/mac68k/obio/if_mc_obio.c
index d1dd70a283e7..ec918e97da59 100644
--- a/sys/arch/mac68k/obio/if_mc_obio.c
+++ b/sys/arch/mac68k/obio/if_mc_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_mc_obio.c,v 1.6 1998/07/08 04:18:54 scottr Exp $	*/
+/*	$NetBSD: if_mc_obio.c,v 1.7 2000/06/29 08:15:14 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1997 David Huang <khym@bga.com>
@@ -46,7 +46,7 @@
 #include <net/if.h>
 #include <net/if_ether.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 #include <machine/psc.h>
diff --git a/sys/arch/macppc/dev/am79c950.c b/sys/arch/macppc/dev/am79c950.c
index b984632486da..0909f4ede094 100644
--- a/sys/arch/macppc/dev/am79c950.c
+++ b/sys/arch/macppc/dev/am79c950.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: am79c950.c,v 1.7 1999/05/18 23:52:53 thorpej Exp $	*/
+/*	$NetBSD: am79c950.c,v 1.8 2000/06/29 08:10:45 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1997 David Huang <khym@bga.com>
@@ -75,7 +75,7 @@
 #include <netccitt/pk_extern.h>
 #endif
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include "bpfilter.h"
 #if NBPFILTER > 0
diff --git a/sys/arch/macppc/dev/dbdma.c b/sys/arch/macppc/dev/dbdma.c
index b75c0507bbcf..156b1faa62c9 100644
--- a/sys/arch/macppc/dev/dbdma.c
+++ b/sys/arch/macppc/dev/dbdma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dbdma.c,v 1.2 1998/08/21 16:13:28 tsubai Exp $	*/
+/*	$NetBSD: dbdma.c,v 1.3 2000/06/29 08:10:45 mrg Exp $	*/
 
 /*
  * Copyright 1991-1998 by Open Software Foundation, Inc. 
@@ -26,7 +26,7 @@
 #include <sys/malloc.h>
 #include <sys/systm.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/pio.h>
 #include <macppc/dev/dbdma.h>
diff --git a/sys/arch/macppc/dev/if_bm.c b/sys/arch/macppc/dev/if_bm.c
index e93f77cc901b..642a1247642e 100644
--- a/sys/arch/macppc/dev/if_bm.c
+++ b/sys/arch/macppc/dev/if_bm.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bm.c,v 1.9 2000/06/16 14:18:55 tsubai Exp $	*/
+/*	$NetBSD: if_bm.c,v 1.10 2000/06/29 08:10:45 mrg Exp $	*/
 
 /*-
  * Copyright (C) 1998, 1999, 2000 Tsubai Masanari.  All rights reserved.
@@ -39,7 +39,7 @@
 #include <sys/systm.h>
 #include <sys/callout.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <net/if.h>
 #include <net/if_ether.h>
diff --git a/sys/arch/macppc/dev/if_gm.c b/sys/arch/macppc/dev/if_gm.c
index 27c5ed659b64..51a3d42ba2cd 100644
--- a/sys/arch/macppc/dev/if_gm.c
+++ b/sys/arch/macppc/dev/if_gm.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_gm.c,v 1.7 2000/06/16 14:18:56 tsubai Exp $	*/
+/*	$NetBSD: if_gm.c,v 1.8 2000/06/29 08:10:45 mrg Exp $	*/
 
 /*-
  * Copyright (c) 2000 Tsubai Masanari.  All rights reserved.
@@ -39,7 +39,7 @@
 #include <sys/systm.h>
 #include <sys/callout.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <net/if.h>
 #include <net/if_ether.h>
diff --git a/sys/arch/macppc/dev/if_mc.c b/sys/arch/macppc/dev/if_mc.c
index 756f963fcafa..3f3f28c6c100 100644
--- a/sys/arch/macppc/dev/if_mc.c
+++ b/sys/arch/macppc/dev/if_mc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_mc.c,v 1.2 1998/05/30 06:16:06 tsubai Exp $	*/
+/*	$NetBSD: if_mc.c,v 1.3 2000/06/29 08:10:45 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1997 David Huang <khym@bga.com>
@@ -45,7 +45,7 @@
 #include <net/if_ether.h>
 #include <net/if_media.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <dev/ofw/openfirm.h>
 
diff --git a/sys/arch/macppc/dev/mesh.c b/sys/arch/macppc/dev/mesh.c
index e939949b0eba..ae432a7be3cc 100644
--- a/sys/arch/macppc/dev/mesh.c
+++ b/sys/arch/macppc/dev/mesh.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mesh.c,v 1.4 2000/03/23 06:40:34 thorpej Exp $	*/
+/*	$NetBSD: mesh.c,v 1.5 2000/06/29 08:10:45 mrg Exp $	*/
 
 /*-
  * Copyright (C) 1999	Internet Research Institute, Inc.
@@ -40,7 +40,7 @@
 #include <sys/queue.h>
 #include <sys/systm.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsipi_all.h>
diff --git a/sys/arch/macppc/dev/ofb.c b/sys/arch/macppc/dev/ofb.c
index 2172587062f7..87ad7d400179 100644
--- a/sys/arch/macppc/dev/ofb.c
+++ b/sys/arch/macppc/dev/ofb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ofb.c,v 1.14 2000/06/26 04:55:48 simonb Exp $	*/
+/*	$NetBSD: ofb.c,v 1.15 2000/06/29 08:10:45 mrg Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -36,7 +36,7 @@
 #include <sys/malloc.h>
 #include <sys/systm.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/arch/macppc/dev/wdc_obio.c b/sys/arch/macppc/dev/wdc_obio.c
index 5af328fb9c4b..1da8b3a579ca 100644
--- a/sys/arch/macppc/dev/wdc_obio.c
+++ b/sys/arch/macppc/dev/wdc_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wdc_obio.c,v 1.9 2000/05/23 13:20:58 tsubai Exp $	*/
+/*	$NetBSD: wdc_obio.c,v 1.10 2000/06/29 08:10:45 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
 #include <sys/device.h>
 #include <sys/malloc.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 #include <machine/autoconf.h>
diff --git a/sys/arch/macppc/macppc/bus_dma.c b/sys/arch/macppc/macppc/bus_dma.c
index 748b9932262d..c93a8daf5379 100644
--- a/sys/arch/macppc/macppc/bus_dma.c
+++ b/sys/arch/macppc/macppc/bus_dma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_dma.c,v 1.15 2000/06/26 14:20:48 mrg Exp $	*/
+/*	$NetBSD: bus_dma.c,v 1.16 2000/06/29 08:10:45 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -45,8 +45,6 @@
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 #define _MACPPC_BUS_DMA_PRIVATE
diff --git a/sys/arch/macppc/macppc/clock.c b/sys/arch/macppc/macppc/clock.c
index e23a45b66734..dcf24818d313 100644
--- a/sys/arch/macppc/macppc/clock.c
+++ b/sys/arch/macppc/macppc/clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.9 2000/01/19 02:52:19 msaitoh Exp $	*/
+/*	$NetBSD: clock.c,v 1.10 2000/06/29 08:10:45 mrg Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -35,8 +35,6 @@
 #include <sys/kernel.h>
 #include <sys/systm.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arch/macppc/macppc/extintr.c b/sys/arch/macppc/macppc/extintr.c
index 9059f195ef5a..336363021ab8 100644
--- a/sys/arch/macppc/macppc/extintr.c
+++ b/sys/arch/macppc/macppc/extintr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: extintr.c,v 1.13 2000/06/26 14:20:48 mrg Exp $	*/
+/*	$NetBSD: extintr.c,v 1.14 2000/06/29 08:10:45 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1995 Per Fogelstrom
@@ -44,7 +44,7 @@
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 #include <machine/intr.h>
diff --git a/sys/arch/macppc/macppc/genassym.cf b/sys/arch/macppc/macppc/genassym.cf
index fda804bcf594..a0f91d5783e6 100644
--- a/sys/arch/macppc/macppc/genassym.cf
+++ b/sys/arch/macppc/macppc/genassym.cf
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.3 2000/05/26 00:36:47 thorpej Exp $
+#	$NetBSD: genassym.cf,v 1.4 2000/06/29 08:10:45 mrg Exp $
 
 #
 # Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -35,7 +35,7 @@ include <sys/param.h>
 include <sys/time.h>
 include <sys/proc.h>
 
-include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 include <machine/pcb.h>
 include <machine/pmap.h>
diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c
index 1af4deb78477..15a4cc460b57 100644
--- a/sys/arch/macppc/macppc/machdep.c
+++ b/sys/arch/macppc/macppc/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.75 2000/06/26 14:20:48 mrg Exp $	*/
+/*	$NetBSD: machdep.c,v 1.76 2000/06/29 08:10:45 mrg Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -58,8 +58,6 @@
 #include <sys/kernel.h>
 #include <sys/user.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 #include <net/netisr.h>
diff --git a/sys/arch/macppc/macppc/rbus_machdep.c b/sys/arch/macppc/macppc/rbus_machdep.c
index 997b65352a5f..7e5f6f630dff 100644
--- a/sys/arch/macppc/macppc/rbus_machdep.c
+++ b/sys/arch/macppc/macppc/rbus_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rbus_machdep.c,v 1.5 2000/06/26 14:20:48 mrg Exp $	*/
+/*	$NetBSD: rbus_machdep.c,v 1.6 2000/06/29 08:10:45 mrg Exp $	*/
 
 /*
  * Copyright (c) 1999
@@ -31,8 +31,6 @@
 #include <sys/device.h>
 #include <sys/systm.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 #include <machine/bat.h>
diff --git a/sys/arch/macppc/pci/pci_machdep.c b/sys/arch/macppc/pci/pci_machdep.c
index 66b003ae7dad..976bfc111b6c 100644
--- a/sys/arch/macppc/pci/pci_machdep.c
+++ b/sys/arch/macppc/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.c,v 1.12 2000/06/26 14:20:48 mrg Exp $	*/
+/*	$NetBSD: pci_machdep.c,v 1.13 2000/06/29 08:10:46 mrg Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -49,7 +49,7 @@
 #include <sys/errno.h>
 #include <sys/device.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #define _MACPPC_BUS_DMA_PRIVATE
 #include <machine/bus.h>
diff --git a/sys/arch/mips/mips/cpu_exec.c b/sys/arch/mips/mips/cpu_exec.c
index 5cb893ca14ca..1fa196a6e8ac 100644
--- a/sys/arch/mips/mips/cpu_exec.c
+++ b/sys/arch/mips/mips/cpu_exec.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu_exec.c,v 1.23 2000/04/11 04:37:47 chs Exp $	*/
+/*	$NetBSD: cpu_exec.c,v 1.24 2000/06/29 08:11:27 mrg Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -48,7 +48,8 @@
 #include <sys/vnode.h>
 #include <sys/exec.h>
 #include <sys/resourcevar.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <sys/exec_ecoff.h>
 #include <sys/exec_elf.h>
diff --git a/sys/arch/mips/mips/db_interface.c b/sys/arch/mips/mips/db_interface.c
index f7bef1056a55..fe734ea079eb 100644
--- a/sys/arch/mips/mips/db_interface.c
+++ b/sys/arch/mips/mips/db_interface.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_interface.c,v 1.28 2000/06/09 06:30:35 soda Exp $	*/
+/*	$NetBSD: db_interface.c,v 1.29 2000/06/29 08:11:27 mrg Exp $	*/
 
 /*
  * Mach Operating System
@@ -36,7 +36,8 @@
 #include <sys/user.h>
 #include <sys/reboot.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
+
 #include <mips/pte.h>
 #include <mips/cpu.h>
 #include <mips/locore.h>
diff --git a/sys/arch/mips/mips/genassym.cf b/sys/arch/mips/mips/genassym.cf
index 57c168495118..602567b8afc2 100644
--- a/sys/arch/mips/mips/genassym.cf
+++ b/sys/arch/mips/mips/genassym.cf
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.19 2000/05/29 23:30:06 simonb Exp $
+#	$NetBSD: genassym.cf,v 1.20 2000/06/29 08:11:27 mrg Exp $
 #
 # Copyright (c) 1997
 #  Jonathan Stone.  All rights reserved.
@@ -46,10 +46,7 @@ include <sys/proc.h>
 include <sys/mbuf.h>
 include <sys/user.h>
 
-include <vm/vm.h>
-
 include <uvm/uvm.h>
-include <uvm/uvm_extern.h>
 
 include <mips/regnum.h>
 include <mips/vmparam.h>
diff --git a/sys/arch/mips/mips/mem.c b/sys/arch/mips/mips/mem.c
index e6a094f89693..8c188874d4a2 100644
--- a/sys/arch/mips/mips/mem.c
+++ b/sys/arch/mips/mips/mem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem.c,v 1.22 2000/06/26 04:55:49 simonb Exp $	*/
+/*	$NetBSD: mem.c,v 1.23 2000/06/29 08:11:27 mrg Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -54,8 +54,6 @@
 
 #include <machine/cpu.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 #define mmread  mmrw
diff --git a/sys/arch/mips/mips/mips_machdep.c b/sys/arch/mips/mips/mips_machdep.c
index 87d7ed4058bc..d751830e6a5e 100644
--- a/sys/arch/mips/mips/mips_machdep.c
+++ b/sys/arch/mips/mips/mips_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mips_machdep.c,v 1.91 2000/06/26 02:55:47 nisimura Exp $	*/
+/*	$NetBSD: mips_machdep.c,v 1.92 2000/06/29 08:11:27 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.91 2000/06/26 02:55:47 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.92 2000/06/29 08:11:27 mrg Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_compat_ultrix.h"
@@ -76,8 +76,6 @@ __KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.91 2000/06/26 02:55:47 nisimura E
 #include <sys/kcore.h>
 #include <machine/kcore.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 #include <mips/regnum.h>		/* symbolic register indices */
diff --git a/sys/arch/mips/mips/pmap.c b/sys/arch/mips/mips/pmap.c
index b3d881531fde..485bf3793e5a 100644
--- a/sys/arch/mips/mips/pmap.c
+++ b/sys/arch/mips/mips/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.102 2000/06/26 14:20:49 mrg Exp $	*/
+/*	$NetBSD: pmap.c,v 1.103 2000/06/29 08:11:27 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.102 2000/06/26 14:20:49 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.103 2000/06/29 08:11:27 mrg Exp $");
 
 /*
  *	Manages physical address maps.
@@ -119,8 +119,6 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.102 2000/06/26 14:20:49 mrg Exp $");
 #include <sys/shm.h>
 #endif
 
-#include <vm/vm.h>
-
 #include <uvm/uvm.h>
 
 #include <mips/cpuregs.h>
diff --git a/sys/arch/mips/mips/sys_machdep.c b/sys/arch/mips/mips/sys_machdep.c
index 45cfc827b0b5..d1a9b5c2d005 100644
--- a/sys/arch/mips/mips/sys_machdep.c
+++ b/sys/arch/mips/mips/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_machdep.c,v 1.17 2000/03/14 14:11:06 soren Exp $	*/
+/*	$NetBSD: sys_machdep.c,v 1.18 2000/06/29 08:11:27 mrg Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -54,7 +54,8 @@
 #include <mips/sysarch.h>
 #include <mips/cachectl.h>
 #include <mips/locore.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #ifdef TRACE
 int	nvualarm;
diff --git a/sys/arch/mips/mips/trap.c b/sys/arch/mips/mips/trap.c
index 4f802b5f8cc7..8b53df5bec5c 100644
--- a/sys/arch/mips/mips/trap.c
+++ b/sys/arch/mips/mips/trap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.141 2000/06/26 14:20:49 mrg Exp $	*/
+/*	$NetBSD: trap.c,v 1.142 2000/06/29 08:11:27 mrg Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -44,7 +44,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.141 2000/06/26 14:20:49 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.142 2000/06/29 08:11:27 mrg Exp $");
 
 #include "opt_cputype.h"	/* which mips CPU levels do we support? */
 #include "opt_inet.h"
@@ -77,8 +77,6 @@ __KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.141 2000/06/26 14:20:49 mrg Exp $");
 #include <mips/locore.h>
 #include <mips/mips_opcode.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 #include <machine/cpu.h>
diff --git a/sys/arch/mips/mips/vm_machdep.c b/sys/arch/mips/mips/vm_machdep.c
index a1d5cc808813..dfdfed68441e 100644
--- a/sys/arch/mips/mips/vm_machdep.c
+++ b/sys/arch/mips/mips/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.66 2000/06/26 14:20:49 mrg Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.67 2000/06/29 08:11:27 mrg Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.66 2000/06/26 14:20:49 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.67 2000/06/29 08:11:27 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -55,8 +55,6 @@ __KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.66 2000/06/26 14:20:49 mrg Exp $");
 #include <sys/core.h>
 #include <sys/exec.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 #include <mips/regnum.h>