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

(Look ma, I might have broken the tree)

8 files changed, 11 insertions, 18 deletions

diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c
index 1fb61c30ae1..56a6f17b146 100644
--- a/sys/miscfs/fdesc/fdesc_vnops.c
+++ b/sys/miscfs/fdesc/fdesc_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fdesc_vnops.c,v 1.24 2001/10/26 12:03:28 art Exp $	*/
+/*	$OpenBSD: fdesc_vnops.c,v 1.25 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: fdesc_vnops.c,v 1.32 1996/04/11 11:24:29 mrg Exp $	*/
 
 /*
@@ -67,7 +67,7 @@
 
 #include <miscfs/fdesc/fdesc.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <sys/pipe.h>
 
diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c
index 5a04a4f2081..c78f89f896e 100644
--- a/sys/miscfs/kernfs/kernfs_vfsops.c
+++ b/sys/miscfs/kernfs/kernfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kernfs_vfsops.c,v 1.15 2001/06/27 04:58:42 art Exp $	*/
+/*	$OpenBSD: kernfs_vfsops.c,v 1.16 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: kernfs_vfsops.c,v 1.26 1996/04/22 01:42:27 christos Exp $	*/
 
 /*
@@ -53,7 +53,6 @@
 #include <sys/namei.h>
 #include <sys/malloc.h>
 
-#include <vm/vm.h>
 #include <uvm/uvm_extern.h>	/* for uvmexp */
 
 #include <miscfs/specfs/specdev.h>
diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c
index 968a613bf7d..e3a2e4381ce 100644
--- a/sys/miscfs/kernfs/kernfs_vnops.c
+++ b/sys/miscfs/kernfs/kernfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kernfs_vnops.c,v 1.21 2001/06/27 04:58:42 art Exp $	*/
+/*	$OpenBSD: kernfs_vnops.c,v 1.22 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: kernfs_vnops.c,v 1.43 1996/03/16 23:52:47 christos Exp $	*/
 
 /*
@@ -60,7 +60,6 @@
 #include <sys/msgbuf.h>
 #include <miscfs/kernfs/kernfs.h>
 
-#include <vm/vm.h>
 #include <uvm/uvm_extern.h>
 
 #define KSTRING	256		/* Largest I/O available via this filesystem */
diff --git a/sys/miscfs/procfs/procfs_cmdline.c b/sys/miscfs/procfs/procfs_cmdline.c
index b986a7beeff..b4f3de9858c 100644
--- a/sys/miscfs/procfs/procfs_cmdline.c
+++ b/sys/miscfs/procfs/procfs_cmdline.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: procfs_cmdline.c,v 1.2 2001/06/27 04:58:43 art Exp $	*/
+/*	$OpenBSD: procfs_cmdline.c,v 1.3 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: procfs_cmdline.c,v 1.3 1999/03/13 22:26:48 thorpej Exp $	*/
 
 /*
@@ -47,8 +47,6 @@
 #include <sys/exec.h>
 #include <sys/malloc.h>
 #include <miscfs/procfs/procfs.h>
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 /*
diff --git a/sys/miscfs/procfs/procfs_linux.c b/sys/miscfs/procfs/procfs_linux.c
index f8cd17567be..fe3072d3ac4 100644
--- a/sys/miscfs/procfs/procfs_linux.c
+++ b/sys/miscfs/procfs/procfs_linux.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: procfs_linux.c,v 1.3 2001/06/27 04:58:43 art Exp $	*/
+/*	$OpenBSD: procfs_linux.c,v 1.4 2001/11/06 19:53:20 miod Exp $	*/
 /*      $NetBSD: procfs_linux.c,v 1.2.4.1 2001/03/30 21:48:11 he Exp $      */
 
 /*
@@ -45,7 +45,6 @@
 
 #include <miscfs/procfs/procfs.h>
 
-#include <vm/vm.h>
 #include <uvm/uvm_extern.h>
 
 #define PGTOB(p)	((unsigned long)(p) << PAGE_SHIFT)
diff --git a/sys/miscfs/procfs/procfs_vfsops.c b/sys/miscfs/procfs/procfs_vfsops.c
index e590ae5b14e..a3033cbd3e0 100644
--- a/sys/miscfs/procfs/procfs_vfsops.c
+++ b/sys/miscfs/procfs/procfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: procfs_vfsops.c,v 1.14 2001/06/27 04:58:44 art Exp $	*/
+/*	$OpenBSD: procfs_vfsops.c,v 1.15 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: procfs_vfsops.c,v 1.25 1996/02/09 22:40:53 christos Exp $	*/
 
 /*
@@ -58,8 +58,6 @@
 
 #include <miscfs/procfs/procfs.h>
 
-#include <vm/vm.h>			/* for PAGE_SIZE */
-
 #include <uvm/uvm_extern.h>
 
 int	procfs_mount __P((struct mount *, const char *, void *,
diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c
index dcb5f794428..ce99ed3834b 100644
--- a/sys/miscfs/procfs/procfs_vnops.c
+++ b/sys/miscfs/procfs/procfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: procfs_vnops.c,v 1.19 2001/06/23 02:14:25 csapuntz Exp $	*/
+/*	$OpenBSD: procfs_vnops.c,v 1.20 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: procfs_vnops.c,v 1.40 1996/03/16 23:52:55 christos Exp $	*/
 
 /*
@@ -59,7 +59,7 @@
 #include <sys/ptrace.h>
 #include <sys/stat.h>
 
-#include <vm/vm.h>	/* for PAGE_SIZE */
+#include <uvm/uvm_extern.h>	/* for PAGE_SIZE */
 
 #include <machine/reg.h>
 
diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c
index 26edd1f0b27..6427ea4da13 100644
--- a/sys/miscfs/union/union_subr.c
+++ b/sys/miscfs/union/union_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: union_subr.c,v 1.9 2001/06/27 04:58:44 art Exp $	*/
+/*	$OpenBSD: union_subr.c,v 1.10 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: union_subr.c,v 1.18 1996/02/09 22:41:10 christos Exp $	*/
 
 /*
@@ -53,7 +53,7 @@
 #include <sys/queue.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
-#include <vm/vm.h>		/* for vnode_pager_setsize */
+#include <uvm/uvm_extern.h>		/* for vnode_pager_setsize */
 #include <miscfs/union/union.h>
 
 #ifdef DIAGNOSTIC