Replace inclusion of <vm/foo.h> with the correct <uvm/bar.h> when necessary.

(Look ma, I might have broken the tree)

14 files changed, 23 insertions, 32 deletions

diff --git a/sys/arch/amiga/amiga/amiga_init.c b/sys/arch/amiga/amiga/amiga_init.c
index 7248ac0d2ef..2bf697be996 100644
--- a/sys/arch/amiga/amiga/amiga_init.c
+++ b/sys/arch/amiga/amiga/amiga_init.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: amiga_init.c,v 1.19 2001/05/14 15:43:11 jj Exp $	*/
+/*	$OpenBSD: amiga_init.c,v 1.20 2001/11/06 19:53:13 miod Exp $	*/
 /*	$NetBSD: amiga_init.c,v 1.56 1997/06/10 18:22:24 veego Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 #include <sys/user.h>
 #include <sys/ioctl.h>
 #include <sys/select.h>
@@ -48,7 +48,7 @@
 #include <sys/dkbad.h>
 #include <sys/reboot.h>
 #include <sys/exec.h>
-#include <vm/pmap.h>
+#include <uvm/uvm_pmap.h>
 #include <machine/vmparam.h>
 #include <machine/pte.h>
 #include <machine/cpu.h>
diff --git a/sys/arch/amiga/amiga/db_memrw.c b/sys/arch/amiga/amiga/db_memrw.c
index 27244e876fc..c2e0fe85db7 100644
--- a/sys/arch/amiga/amiga/db_memrw.c
+++ b/sys/arch/amiga/amiga/db_memrw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_memrw.c,v 1.6 1997/10/07 10:57:37 niklas Exp $	*/
+/*	$OpenBSD: db_memrw.c,v 1.7 2001/11/06 19:53:13 miod Exp $	*/
 /*	$NetBSD: db_memrw.c,v 1.7 1997/06/10 18:24:34 veego Exp $	*/
 
 /*-
@@ -47,7 +47,7 @@
 #include <sys/param.h>
 #include <sys/proc.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/db_machdep.h>
 #include <ddb/db_sym.h>
diff --git a/sys/arch/amiga/amiga/genassym.cf b/sys/arch/amiga/amiga/genassym.cf
index 24226293301..c5c7be6b7e4 100644
--- a/sys/arch/amiga/amiga/genassym.cf
+++ b/sys/arch/amiga/amiga/genassym.cf
@@ -1,5 +1,5 @@
 #	$NetBSD: genassym.cf,v 1.3 1997/07/16 00:01:49 is Exp $
-#	$OpenBSD: genassym.cf,v 1.9 2001/09/16 14:28:04 miod Exp $
+#	$OpenBSD: genassym.cf,v 1.10 2001/11/06 19:53:13 miod Exp $
 #
 # Copyright (c) 1982, 1990, 1993
 #	The Regents of the University of California.  All rights reserved.
@@ -43,8 +43,6 @@ include <sys/msgbuf.h>
 include <sys/syscall.h>
 include <sys/user.h>
 
-include <vm/vm.h>
-
 include <uvm/uvm_extern.h>
 
 include <machine/cpu.h>
diff --git a/sys/arch/amiga/amiga/machdep.c b/sys/arch/amiga/amiga/machdep.c
index 0951719814e..ffa2dd4fd1b 100644
--- a/sys/arch/amiga/amiga/machdep.c
+++ b/sys/arch/amiga/amiga/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.54 2001/09/19 20:50:56 mickey Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.55 2001/11/06 19:53:13 miod Exp $	*/
 /*	$NetBSD: machdep.c,v 1.95 1997/08/27 18:31:17 is Exp $	*/
 
 /*
@@ -79,7 +79,6 @@
 #include <net/netisr.h>
 #define	MAXMEM	64*1024	/* XXX - from cmap.h */
 
-#include <vm/vm.h>
 #include <uvm/uvm_extern.h>
 
 #include <machine/db_machdep.h>
diff --git a/sys/arch/amiga/amiga/mem.c b/sys/arch/amiga/amiga/mem.c
index d5ba3c6d83c..e14ab32e6cd 100644
--- a/sys/arch/amiga/amiga/mem.c
+++ b/sys/arch/amiga/amiga/mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mem.c,v 1.15 2001/11/01 12:13:45 art Exp $	*/
+/*	$OpenBSD: mem.c,v 1.16 2001/11/06 19:53:14 miod Exp $	*/
 /*	$NetBSD: mem.c,v 1.18 1997/02/02 07:17:14 thorpej Exp $	*/
 
 /*
@@ -55,7 +55,6 @@
 
 #include <machine/cpu.h>
 
-#include <vm/vm.h>
 #include <uvm/uvm_extern.h>
 
 extern int kernel_reload_write(struct uio *uio);
diff --git a/sys/arch/amiga/amiga/pmap.c b/sys/arch/amiga/amiga/pmap.c
index f188ecab687..f004113cac9 100644
--- a/sys/arch/amiga/amiga/pmap.c
+++ b/sys/arch/amiga/amiga/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.36 2001/11/06 01:47:02 art Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.37 2001/11/06 19:53:14 miod Exp $	*/
 /*	$NetBSD: pmap.c,v 1.68 1999/06/19 19:44:09 is Exp $	*/
 
 /*-
@@ -119,7 +119,6 @@
 #include <sys/msgbuf.h>
 #include <sys/user.h>
 #include <uvm/uvm.h>
-#include <uvm/uvm_extern.h>
 #include <machine/pte.h>
 #include <machine/cpu.h>
 #include <machine/vmparam.h>
diff --git a/sys/arch/amiga/amiga/sys_machdep.c b/sys/arch/amiga/amiga/sys_machdep.c
index 437d43d1c4c..727b08e59be 100644
--- a/sys/arch/amiga/amiga/sys_machdep.c
+++ b/sys/arch/amiga/amiga/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_machdep.c,v 1.10 2001/06/14 10:41:50 jj Exp $	*/
+/*	$OpenBSD: sys_machdep.c,v 1.11 2001/11/06 19:53:14 miod Exp $	*/
 /*	$NetBSD: sys_machdep.c,v 1.16 1997/05/19 10:14:47 veego Exp $	*/
 
 /*
@@ -51,7 +51,7 @@
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/cpu.h>
 
diff --git a/sys/arch/amiga/amiga/trap.c b/sys/arch/amiga/amiga/trap.c
index 01a801fa8b0..7aeef6642a0 100644
--- a/sys/arch/amiga/amiga/trap.c
+++ b/sys/arch/amiga/amiga/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.23 2001/11/06 18:41:09 art Exp $	*/
+/*	$OpenBSD: trap.c,v 1.24 2001/11/06 19:53:14 miod Exp $	*/
 /*	$NetBSD: trap.c,v 1.56 1997/07/16 00:01:47 is Exp $	*/
 
 /*
@@ -56,11 +56,9 @@
 #include <sys/ktrace.h>
 #endif
 
-#include <vm/vm.h>
 #include <sys/user.h>
-#include <vm/pmap.h>
-
 #include <uvm/uvm_extern.h>
+#include <uvm/uvm_pmap.h>
 
 #include <machine/psl.h>
 #include <machine/trap.h>
diff --git a/sys/arch/amiga/amiga/vm_machdep.c b/sys/arch/amiga/amiga/vm_machdep.c
index 5d59a8db699..8cf82fa91a8 100644
--- a/sys/arch/amiga/amiga/vm_machdep.c
+++ b/sys/arch/amiga/amiga/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.24 2001/11/06 18:41:09 art Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.25 2001/11/06 19:53:14 miod Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.30 1997/05/19 10:14:50 veego Exp $	*/
 
 /*
@@ -56,7 +56,6 @@
 
 #include <machine/cpu.h>
 
-#include <vm/vm.h>
 #include <sys/user.h>
 #include <uvm/uvm_extern.h>
 #include <machine/pte.h>
diff --git a/sys/arch/amiga/dev/clock.c b/sys/arch/amiga/dev/clock.c
index 2b2ffe33615..20849b8dcf9 100644
--- a/sys/arch/amiga/dev/clock.c
+++ b/sys/arch/amiga/dev/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.10 1997/09/18 13:39:43 niklas Exp $	*/
+/*	$OpenBSD: clock.c,v 1.11 2001/11/06 19:53:14 miod Exp $	*/
 /*	$NetBSD: clock.c,v 1.25 1997/01/02 20:59:42 is Exp $	*/
 
 /*
@@ -403,7 +403,7 @@ clkread()
 #include <sys/resourcevar.h>
 #include <sys/ioctl.h>
 #include <sys/malloc.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 #include <amiga/amiga/clockioctl.h>
 #include <sys/specdev.h>
 #include <sys/vnode.h>
diff --git a/sys/arch/amiga/dev/grf.c b/sys/arch/amiga/dev/grf.c
index 018b57ab80e..a4d3ac867d0 100644
--- a/sys/arch/amiga/dev/grf.c
+++ b/sys/arch/amiga/dev/grf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grf.c,v 1.13 2001/11/05 20:12:31 art Exp $	*/
+/*	$OpenBSD: grf.c,v 1.14 2001/11/06 19:53:14 miod Exp $	*/
 /*	$NetBSD: grf.c,v 1.32 1996/12/23 09:10:01 veego Exp $	*/
 
 /*
@@ -58,7 +58,7 @@
 #include <sys/systm.h>
 #include <sys/vnode.h>
 #include <sys/mman.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 #include <machine/cpu.h>
 #include <machine/fbio.h>
 #include <amiga/amiga/color.h>	/* DEBUG */
diff --git a/sys/arch/amiga/dev/grf_cc.c b/sys/arch/amiga/dev/grf_cc.c
index 0a42c9f611b..b0c75ad4eef 100644
--- a/sys/arch/amiga/dev/grf_cc.c
+++ b/sys/arch/amiga/dev/grf_cc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grf_cc.c,v 1.8 2001/11/06 00:30:37 art Exp $	*/
+/*	$OpenBSD: grf_cc.c,v 1.9 2001/11/06 19:53:14 miod Exp $	*/
 /*	$NetBSD: grf_cc.c,v 1.23 1996/12/23 09:10:02 veego Exp $	*/
 
 /*
@@ -58,7 +58,7 @@
 
 #include <sys/conf.h>
 #include <machine/conf.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include "view.h" 
 
diff --git a/sys/arch/amiga/dev/sbic.c b/sys/arch/amiga/dev/sbic.c
index 38f5c146de5..1d540674a43 100644
--- a/sys/arch/amiga/dev/sbic.c
+++ b/sys/arch/amiga/dev/sbic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbic.c,v 1.13 2001/11/06 01:47:02 art Exp $	*/
+/*	$OpenBSD: sbic.c,v 1.14 2001/11/06 19:53:14 miod Exp $	*/
 /*	$NetBSD: sbic.c,v 1.28 1996/10/13 03:07:29 christos Exp $	*/
 
 /*
@@ -66,7 +66,7 @@
 #include <amiga/amiga/cc.h>
 #include <amiga/dev/zbusvar.h>
 
-#include <vm/pmap.h>
+#include <uvm/uvm_pmap.h>
 
 /* Since I can't find this in any other header files */
 #define SCSI_PHASE(reg)	(reg&0x07)
diff --git a/sys/arch/amiga/isa/cross.c b/sys/arch/amiga/isa/cross.c
index 8dc4fb6a65a..b01ddbb46e6 100644
--- a/sys/arch/amiga/isa/cross.c
+++ b/sys/arch/amiga/isa/cross.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cross.c,v 1.17 2001/09/19 20:50:56 mickey Exp $	*/
+/*	$OpenBSD: cross.c,v 1.18 2001/11/06 19:53:14 miod Exp $	*/
 
 /*
  * Copyright (c) 1994, 1996 Niklas Hallqvist, Carsten Hammer
@@ -37,7 +37,6 @@
 #include <sys/syslog.h>
 #include <sys/systm.h>
 
-#include <vm/vm.h>
 #include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>