summaryrefslogtreecommitdiff
path: root/sys/arch/alpha
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2001-11-06 19:53:22 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2001-11-06 19:53:22 +0000
commit1a05584a00bbab0c5d169a8d3af7b22cafbfd92e (patch)
tree5ddd0ec6d94f69ad3960926e58a87b6d82166c7a /sys/arch/alpha
parentef75d88ca83504eb18013af4622826ef9b5ff28d (diff)
Replace inclusion of <vm/foo.h> with the correct <uvm/bar.h> when necessary.
(Look ma, I might have broken the tree)
Diffstat (limited to 'sys/arch/alpha')
-rw-r--r--sys/arch/alpha/alpha/cpu.c4
-rw-r--r--sys/arch/alpha/alpha/db_interface.c4
-rw-r--r--sys/arch/alpha/alpha/db_trace.c4
-rw-r--r--sys/arch/alpha/alpha/genassym.cf4
-rw-r--r--sys/arch/alpha/alpha/interrupt.c4
-rw-r--r--sys/arch/alpha/alpha/machdep.c4
-rw-r--r--sys/arch/alpha/alpha/mem.c4
-rw-r--r--sys/arch/alpha/alpha/netbsd_machdep.c4
-rw-r--r--sys/arch/alpha/alpha/prom.c4
-rw-r--r--sys/arch/alpha/alpha/trap.c3
-rw-r--r--sys/arch/alpha/alpha/vm_machdep.c3
-rw-r--r--sys/arch/alpha/dev/bus_dma.c3
-rw-r--r--sys/arch/alpha/dev/sgmap_common.c3
-rw-r--r--sys/arch/alpha/include/db_machdep.h4
-rw-r--r--sys/arch/alpha/isa/isa_machdep.c3
-rw-r--r--sys/arch/alpha/isa/isadma_bounce.c3
-rw-r--r--sys/arch/alpha/pci/apecs.c4
-rw-r--r--sys/arch/alpha/pci/apecs_bus_io.c4
-rw-r--r--sys/arch/alpha/pci/apecs_bus_mem.c4
-rw-r--r--sys/arch/alpha/pci/apecs_dma.c3
-rw-r--r--sys/arch/alpha/pci/apecs_lca_bus_io.c4
-rw-r--r--sys/arch/alpha/pci/apecs_lca_bus_mem.c4
-rw-r--r--sys/arch/alpha/pci/apecs_pci.c4
-rw-r--r--sys/arch/alpha/pci/cia.c4
-rw-r--r--sys/arch/alpha/pci/cia_bus_io.c4
-rw-r--r--sys/arch/alpha/pci/cia_bus_mem.c4
-rw-r--r--sys/arch/alpha/pci/cia_bwx_bus_io.c3
-rw-r--r--sys/arch/alpha/pci/cia_bwx_bus_mem.c3
-rw-r--r--sys/arch/alpha/pci/cia_dma.c3
-rw-r--r--sys/arch/alpha/pci/cia_pci.c3
-rw-r--r--sys/arch/alpha/pci/irongate_bus_io.c3
-rw-r--r--sys/arch/alpha/pci/irongate_bus_mem.c3
-rw-r--r--sys/arch/alpha/pci/irongate_dma.c3
-rw-r--r--sys/arch/alpha/pci/irongate_pci.c3
-rw-r--r--sys/arch/alpha/pci/lca.c4
-rw-r--r--sys/arch/alpha/pci/lca_bus_io.c4
-rw-r--r--sys/arch/alpha/pci/lca_bus_mem.c4
-rw-r--r--sys/arch/alpha/pci/lca_dma.c3
-rw-r--r--sys/arch/alpha/pci/lca_pci.c4
-rw-r--r--sys/arch/alpha/pci/pci_2100_a50.c4
-rw-r--r--sys/arch/alpha/pci/pci_550.c3
-rw-r--r--sys/arch/alpha/pci/pci_6600.c3
-rw-r--r--sys/arch/alpha/pci/pci_axppci_33.c4
-rw-r--r--sys/arch/alpha/pci/pci_eb164.c3
-rw-r--r--sys/arch/alpha/pci/pci_kn20aa.c4
-rw-r--r--sys/arch/alpha/pci/pci_machdep.c4
-rw-r--r--sys/arch/alpha/pci/pci_sgmap_pte64.c3
-rw-r--r--sys/arch/alpha/pci/pci_up1000.c3
-rw-r--r--sys/arch/alpha/pci/tsp_bus_io.c3
-rw-r--r--sys/arch/alpha/pci/tsp_bus_mem.c3
-rw-r--r--sys/arch/alpha/pci/tsp_dma.c3
-rw-r--r--sys/arch/alpha/pci/tsp_pci.c3
-rw-r--r--sys/arch/alpha/tc/tc_bus_mem.c4
53 files changed, 79 insertions, 108 deletions
diff --git a/sys/arch/alpha/alpha/cpu.c b/sys/arch/alpha/alpha/cpu.c
index 434bac1b497..727d6f19a02 100644
--- a/sys/arch/alpha/alpha/cpu.c
+++ b/sys/arch/alpha/alpha/cpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.c,v 1.10 2001/04/15 05:54:39 art Exp $ */
+/* $OpenBSD: cpu.c,v 1.11 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: cpu.c,v 1.44 2000/05/23 05:12:53 thorpej Exp $ */
/*-
@@ -72,7 +72,7 @@
#include <sys/proc.h>
#include <sys/user.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/atomic.h>
#include <machine/autoconf.h>
diff --git a/sys/arch/alpha/alpha/db_interface.c b/sys/arch/alpha/alpha/db_interface.c
index 810c5ab30e7..e154d286dc4 100644
--- a/sys/arch/alpha/alpha/db_interface.c
+++ b/sys/arch/alpha/alpha/db_interface.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_interface.c,v 1.12 2001/03/04 19:19:43 niklas Exp $ */
+/* $OpenBSD: db_interface.c,v 1.13 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: db_interface.c,v 1.8 1999/10/12 17:08:57 jdolecek Exp $ */
/*
@@ -53,7 +53,7 @@
#include <sys/reboot.h>
#include <sys/systm.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <dev/cons.h>
diff --git a/sys/arch/alpha/alpha/db_trace.c b/sys/arch/alpha/alpha/db_trace.c
index 48ce033bcbf..1be316ba40c 100644
--- a/sys/arch/alpha/alpha/db_trace.c
+++ b/sys/arch/alpha/alpha/db_trace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_trace.c,v 1.7 2001/03/04 19:19:42 niklas Exp $ */
+/* $OpenBSD: db_trace.c,v 1.8 2001/11/06 19:53:13 miod Exp $ */
/*
* Copyright (c) 1997 Niklas Hallqvist. All rights reserverd.
@@ -35,7 +35,7 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/db_machdep.h>
#include <machine/frame.h>
diff --git a/sys/arch/alpha/alpha/genassym.cf b/sys/arch/alpha/alpha/genassym.cf
index 677c75793d9..41864c49f9b 100644
--- a/sys/arch/alpha/alpha/genassym.cf
+++ b/sys/arch/alpha/alpha/genassym.cf
@@ -1,4 +1,4 @@
-# $OpenBSD: genassym.cf,v 1.2 2001/09/16 14:28:01 miod Exp $
+# $OpenBSD: genassym.cf,v 1.3 2001/11/06 19:53:13 miod Exp $
# Copyright (c) 1994, 1995 Gordon W. Ross
# Copyright (c) 1993 Adam Glass
@@ -52,7 +52,7 @@ ifdef COMPAT_NETBSD
include <compat/netbsd/netbsd_syscall.h>
endif
-include <vm/vm.h>
+include <uvm/uvm_extern.h>
# general constants
export NBPG
diff --git a/sys/arch/alpha/alpha/interrupt.c b/sys/arch/alpha/alpha/interrupt.c
index 22a0faa482c..0a399fb6ba2 100644
--- a/sys/arch/alpha/alpha/interrupt.c
+++ b/sys/arch/alpha/alpha/interrupt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: interrupt.c,v 1.12 2001/09/30 13:08:45 art Exp $ */
+/* $OpenBSD: interrupt.c,v 1.13 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: interrupt.c,v 1.46 2000/06/03 20:47:36 thorpej Exp $ */
/*-
@@ -80,8 +80,6 @@
#include <sys/mbuf.h>
#include <sys/socket.h>
-#include <vm/vm.h>
-
#include <uvm/uvm_extern.h>
#include <machine/atomic.h>
diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index 6d62c55932d..79f4f783e14 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.55 2001/09/30 13:08:45 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.56 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */
/*-
@@ -86,7 +86,7 @@
#include <sys/user.h>
#include <sys/exec.h>
#include <sys/exec_ecoff.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <sys/sysctl.h>
#include <sys/core.h>
#include <sys/kcore.h>
diff --git a/sys/arch/alpha/alpha/mem.c b/sys/arch/alpha/alpha/mem.c
index 7511c84a86c..6ac090f63c4 100644
--- a/sys/arch/alpha/alpha/mem.c
+++ b/sys/arch/alpha/alpha/mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mem.c,v 1.15 2001/11/01 14:32:01 art Exp $ */
+/* $OpenBSD: mem.c,v 1.16 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: mem.c,v 1.26 2000/03/29 03:48:20 simonb Exp $ */
/*
@@ -56,8 +56,6 @@
#include <machine/cpu.h>
-#include <vm/vm.h>
-
#include <uvm/uvm_extern.h>
#define mmread mmrw
diff --git a/sys/arch/alpha/alpha/netbsd_machdep.c b/sys/arch/alpha/alpha/netbsd_machdep.c
index 14a6fd4263c..116218bb1ec 100644
--- a/sys/arch/alpha/alpha/netbsd_machdep.c
+++ b/sys/arch/alpha/alpha/netbsd_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netbsd_machdep.c,v 1.5 2001/09/05 23:39:13 art Exp $ */
+/* $OpenBSD: netbsd_machdep.c,v 1.6 2001/11/06 19:53:13 miod Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -39,7 +39,7 @@
#include <sys/user.h>
#include <machine/cpu.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <compat/netbsd/netbsd_types.h>
#include <compat/netbsd/netbsd_signal.h>
diff --git a/sys/arch/alpha/alpha/prom.c b/sys/arch/alpha/alpha/prom.c
index d91487ee7c1..2df5ed675c4 100644
--- a/sys/arch/alpha/alpha/prom.c
+++ b/sys/arch/alpha/alpha/prom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: prom.c,v 1.11 2001/04/17 04:30:45 aaron Exp $ */
+/* $OpenBSD: prom.c,v 1.12 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: prom.c,v 1.39 2000/03/06 21:36:05 thorpej Exp $ */
/*
@@ -28,7 +28,7 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <sys/lock.h>
#include <sys/proc.h>
#include <sys/user.h>
diff --git a/sys/arch/alpha/alpha/trap.c b/sys/arch/alpha/alpha/trap.c
index 31e6fa36194..67317763768 100644
--- a/sys/arch/alpha/alpha/trap.c
+++ b/sys/arch/alpha/alpha/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.26 2001/07/09 18:55:21 millert Exp $ */
+/* $OpenBSD: trap.c,v 1.27 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: trap.c,v 1.52 2000/05/24 16:48:33 thorpej Exp $ */
/*-
@@ -106,7 +106,6 @@
#include <sys/ktrace.h>
#endif
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/cpu.h>
diff --git a/sys/arch/alpha/alpha/vm_machdep.c b/sys/arch/alpha/alpha/vm_machdep.c
index bf8d1c8ae1c..b44203dd34e 100644
--- a/sys/arch/alpha/alpha/vm_machdep.c
+++ b/sys/arch/alpha/alpha/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.25 2001/11/06 18:41:09 art Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.26 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: vm_machdep.c,v 1.55 2000/03/29 03:49:48 simonb Exp $ */
/*
@@ -39,7 +39,6 @@
#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/alpha/dev/bus_dma.c b/sys/arch/alpha/dev/bus_dma.c
index 81b7171a774..1444b849247 100644
--- a/sys/arch/alpha/dev/bus_dma.c
+++ b/sys/arch/alpha/dev/bus_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus_dma.c,v 1.5 2001/11/05 17:25:57 art Exp $ */
+/* $OpenBSD: bus_dma.c,v 1.6 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: bus_dma.c,v 1.40 2000/07/17 04:47:56 thorpej Exp $ */
/*-
@@ -47,7 +47,6 @@
#include <sys/proc.h>
#include <sys/mbuf.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/arch/alpha/dev/sgmap_common.c b/sys/arch/alpha/dev/sgmap_common.c
index 552d71e7935..979096ee45c 100644
--- a/sys/arch/alpha/dev/sgmap_common.c
+++ b/sys/arch/alpha/dev/sgmap_common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sgmap_common.c,v 1.2 2001/07/05 10:00:25 art Exp $ */
+/* $OpenBSD: sgmap_common.c,v 1.3 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: sgmap_common.c,v 1.13 2000/06/29 09:02:57 mrg Exp $ */
/*-
@@ -44,7 +44,6 @@
#include <sys/malloc.h>
#include <sys/proc.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/arch/alpha/include/db_machdep.h b/sys/arch/alpha/include/db_machdep.h
index 9436efb88b8..5c980173461 100644
--- a/sys/arch/alpha/include/db_machdep.h
+++ b/sys/arch/alpha/include/db_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_machdep.h,v 1.11 2001/03/04 19:19:43 niklas Exp $ */
+/* $OpenBSD: db_machdep.h,v 1.12 2001/11/06 19:53:13 miod Exp $ */
/*
* Copyright (c) 1997 Niklas Hallqvist. All rights reserverd.
@@ -33,7 +33,7 @@
#define _ALPHA_DB_MACHDEP_H_
/* XXX - Need to include vm.h for boolean_t */
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#define DB_MACHINE_COMMANDS
diff --git a/sys/arch/alpha/isa/isa_machdep.c b/sys/arch/alpha/isa/isa_machdep.c
index 212ad493c3a..5c9f998e46c 100644
--- a/sys/arch/alpha/isa/isa_machdep.c
+++ b/sys/arch/alpha/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isa_machdep.c,v 1.8 2001/08/08 15:21:28 millert Exp $ */
+/* $OpenBSD: isa_machdep.c,v 1.9 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: isa_machdep.c,v 1.12 1998/08/07 10:26:39 drochner Exp $ */
/*
@@ -39,7 +39,6 @@
#include <sys/errno.h>
#include <sys/device.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <dev/isa/isavar.h>
diff --git a/sys/arch/alpha/isa/isadma_bounce.c b/sys/arch/alpha/isa/isadma_bounce.c
index 14b61e65560..b6dd4e893f8 100644
--- a/sys/arch/alpha/isa/isadma_bounce.c
+++ b/sys/arch/alpha/isa/isadma_bounce.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isadma_bounce.c,v 1.2 2001/11/05 17:25:57 art Exp $ */
+/* $OpenBSD: isadma_bounce.c,v 1.3 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: isadma_bounce.c,v 1.3 2000/06/29 09:02:57 mrg Exp $ */
/*-
@@ -52,7 +52,6 @@
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
extern paddr_t avail_end;
diff --git a/sys/arch/alpha/pci/apecs.c b/sys/arch/alpha/pci/apecs.c
index e8561a3e486..bd2aa724dfa 100644
--- a/sys/arch/alpha/pci/apecs.c
+++ b/sys/arch/alpha/pci/apecs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apecs.c,v 1.14 2001/11/04 23:12:46 art Exp $ */
+/* $OpenBSD: apecs.c,v 1.15 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: apecs.c,v 1.16 1996/12/05 01:39:34 cgd Exp $ */
/*-
@@ -69,7 +69,7 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
#include <machine/rpb.h>
diff --git a/sys/arch/alpha/pci/apecs_bus_io.c b/sys/arch/alpha/pci/apecs_bus_io.c
index e218e7ef4cd..88b081cea8a 100644
--- a/sys/arch/alpha/pci/apecs_bus_io.c
+++ b/sys/arch/alpha/pci/apecs_bus_io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apecs_bus_io.c,v 1.5 2001/02/16 09:07:19 jason Exp $ */
+/* $OpenBSD: apecs_bus_io.c,v 1.6 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: apecs_bus_io.c,v 1.8 1997/09/02 13:19:10 thorpej Exp $ */
/*
@@ -34,7 +34,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/apecs_bus_mem.c b/sys/arch/alpha/pci/apecs_bus_mem.c
index 0572c9abf58..845460e78d2 100644
--- a/sys/arch/alpha/pci/apecs_bus_mem.c
+++ b/sys/arch/alpha/pci/apecs_bus_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apecs_bus_mem.c,v 1.5 2001/02/16 09:07:20 jason Exp $ */
+/* $OpenBSD: apecs_bus_mem.c,v 1.6 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: apecs_bus_mem.c,v 1.8 1997/09/02 13:19:12 thorpej Exp $ */
/*
@@ -34,7 +34,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/apecs_dma.c b/sys/arch/alpha/pci/apecs_dma.c
index 341de0c80b5..886e1c3b2c1 100644
--- a/sys/arch/alpha/pci/apecs_dma.c
+++ b/sys/arch/alpha/pci/apecs_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apecs_dma.c,v 1.1 2001/02/16 05:17:31 jason Exp $ */
+/* $OpenBSD: apecs_dma.c,v 1.2 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: apecs_dma.c,v 1.13 2000/06/29 08:58:45 mrg Exp $ */
/*-
@@ -50,7 +50,6 @@
#include <sys/device.h>
#include <sys/malloc.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/apecs_lca_bus_io.c b/sys/arch/alpha/pci/apecs_lca_bus_io.c
index 1aecc2f25c7..92d87d8e833 100644
--- a/sys/arch/alpha/pci/apecs_lca_bus_io.c
+++ b/sys/arch/alpha/pci/apecs_lca_bus_io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apecs_lca_bus_io.c,v 1.6 2001/02/06 19:26:39 art Exp $ */
+/* $OpenBSD: apecs_lca_bus_io.c,v 1.7 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: apecs_lca_bus_io.c,v 1.4 1996/08/27 16:29:23 cgd Exp $ */
/*
@@ -33,7 +33,7 @@
#include <sys/malloc.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/apecs_lca_bus_mem.c b/sys/arch/alpha/pci/apecs_lca_bus_mem.c
index e1c22d167f5..3ff597f539d 100644
--- a/sys/arch/alpha/pci/apecs_lca_bus_mem.c
+++ b/sys/arch/alpha/pci/apecs_lca_bus_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apecs_lca_bus_mem.c,v 1.6 2001/02/06 19:26:39 art Exp $ */
+/* $OpenBSD: apecs_lca_bus_mem.c,v 1.7 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: apecs_lca_bus_mem.c,v 1.5 1996/08/27 16:29:24 cgd Exp $ */
/*
@@ -33,7 +33,7 @@
#include <sys/malloc.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/apecs_pci.c b/sys/arch/alpha/pci/apecs_pci.c
index c181d34d6fa..802fea7e2f4 100644
--- a/sys/arch/alpha/pci/apecs_pci.c
+++ b/sys/arch/alpha/pci/apecs_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apecs_pci.c,v 1.7 2001/02/16 08:23:39 jason Exp $ */
+/* $OpenBSD: apecs_pci.c,v 1.8 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: apecs_pci.c,v 1.10 1996/11/13 21:13:25 cgd Exp $ */
/*
@@ -33,7 +33,7 @@
#include <sys/kernel.h>
#include <sys/device.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/autoconf.h> /* badaddr() proto */
diff --git a/sys/arch/alpha/pci/cia.c b/sys/arch/alpha/pci/cia.c
index d4401094a2b..49b04da2878 100644
--- a/sys/arch/alpha/pci/cia.c
+++ b/sys/arch/alpha/pci/cia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cia.c,v 1.15 2001/11/04 23:12:46 art Exp $ */
+/* $OpenBSD: cia.c,v 1.16 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: cia.c,v 1.56 2000/06/29 08:58:45 mrg Exp $ */
/*-
@@ -70,7 +70,7 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
#include <machine/rpb.h>
diff --git a/sys/arch/alpha/pci/cia_bus_io.c b/sys/arch/alpha/pci/cia_bus_io.c
index 35ba8b56cb3..030fcc05e95 100644
--- a/sys/arch/alpha/pci/cia_bus_io.c
+++ b/sys/arch/alpha/pci/cia_bus_io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cia_bus_io.c,v 1.7 2001/02/06 19:26:39 art Exp $ */
+/* $OpenBSD: cia_bus_io.c,v 1.8 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: cia_bus_io.c,v 1.6 1996/11/25 03:46:07 cgd Exp $ */
/*
@@ -33,7 +33,7 @@
#include <sys/malloc.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/cia_bus_mem.c b/sys/arch/alpha/pci/cia_bus_mem.c
index d652974df3f..66ae308fa95 100644
--- a/sys/arch/alpha/pci/cia_bus_mem.c
+++ b/sys/arch/alpha/pci/cia_bus_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cia_bus_mem.c,v 1.7 2001/02/06 19:26:39 art Exp $ */
+/* $OpenBSD: cia_bus_mem.c,v 1.8 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: cia_bus_mem.c,v 1.7 1996/11/25 03:46:09 cgd Exp $ */
/*
@@ -33,7 +33,7 @@
#include <sys/malloc.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/cia_bwx_bus_io.c b/sys/arch/alpha/pci/cia_bwx_bus_io.c
index 9dec75e0bd4..3d29b642ac3 100644
--- a/sys/arch/alpha/pci/cia_bwx_bus_io.c
+++ b/sys/arch/alpha/pci/cia_bwx_bus_io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cia_bwx_bus_io.c,v 1.2 2000/11/08 20:59:25 ericj Exp $ */
+/* $OpenBSD: cia_bwx_bus_io.c,v 1.3 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: cia_bwx_bus_io.c,v 1.3 2000/06/29 08:58:46 mrg Exp $ */
/*
@@ -34,7 +34,6 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/cia_bwx_bus_mem.c b/sys/arch/alpha/pci/cia_bwx_bus_mem.c
index 2e71400f52a..eca78274091 100644
--- a/sys/arch/alpha/pci/cia_bwx_bus_mem.c
+++ b/sys/arch/alpha/pci/cia_bwx_bus_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cia_bwx_bus_mem.c,v 1.2 2000/11/08 20:59:25 ericj Exp $ */
+/* $OpenBSD: cia_bwx_bus_mem.c,v 1.3 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: cia_bwx_bus_mem.c,v 1.3 2000/06/29 08:58:46 mrg Exp $ */
/*
@@ -34,7 +34,6 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/cia_dma.c b/sys/arch/alpha/pci/cia_dma.c
index 282456d27eb..534b4743714 100644
--- a/sys/arch/alpha/pci/cia_dma.c
+++ b/sys/arch/alpha/pci/cia_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cia_dma.c,v 1.2 2000/11/08 20:59:25 ericj Exp $ */
+/* $OpenBSD: cia_dma.c,v 1.3 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: cia_dma.c,v 1.16 2000/06/29 08:58:46 mrg Exp $ */
/*-
@@ -50,7 +50,6 @@
#include <sys/device.h>
#include <sys/malloc.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/cia_pci.c b/sys/arch/alpha/pci/cia_pci.c
index eb6d65e3822..e219e620297 100644
--- a/sys/arch/alpha/pci/cia_pci.c
+++ b/sys/arch/alpha/pci/cia_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cia_pci.c,v 1.7 2000/11/08 20:59:25 ericj Exp $ */
+/* $OpenBSD: cia_pci.c,v 1.8 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: cia_pci.c,v 1.25 2000/06/29 08:58:46 mrg Exp $ */
/*
@@ -33,7 +33,6 @@
#include <sys/kernel.h>
#include <sys/device.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/arch/alpha/pci/irongate_bus_io.c b/sys/arch/alpha/pci/irongate_bus_io.c
index 168ee1b8887..54fa34eecd5 100644
--- a/sys/arch/alpha/pci/irongate_bus_io.c
+++ b/sys/arch/alpha/pci/irongate_bus_io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: irongate_bus_io.c,v 1.2 2001/04/17 14:53:33 art Exp $ */
+/* $OpenBSD: irongate_bus_io.c,v 1.3 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: irongate_bus_io.c,v 1.4 2000/06/29 08:58:47 mrg Exp $ */
/*-
@@ -43,7 +43,6 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/irongate_bus_mem.c b/sys/arch/alpha/pci/irongate_bus_mem.c
index edf93b20bb1..d6235891fec 100644
--- a/sys/arch/alpha/pci/irongate_bus_mem.c
+++ b/sys/arch/alpha/pci/irongate_bus_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: irongate_bus_mem.c,v 1.4 2001/04/18 10:31:03 art Exp $ */
+/* $OpenBSD: irongate_bus_mem.c,v 1.5 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: irongate_bus_mem.c,v 1.7 2001/04/17 21:52:00 thorpej Exp $ */
/*-
@@ -43,7 +43,6 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/irongate_dma.c b/sys/arch/alpha/pci/irongate_dma.c
index fc0c99e1900..20ab907ab82 100644
--- a/sys/arch/alpha/pci/irongate_dma.c
+++ b/sys/arch/alpha/pci/irongate_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: irongate_dma.c,v 1.3 2001/11/05 02:41:02 art Exp $ */
+/* $OpenBSD: irongate_dma.c,v 1.4 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: irongate_dma.c,v 1.3 2000/06/29 08:58:47 mrg Exp $ */
/*-
@@ -62,7 +62,6 @@
#include <sys/device.h>
#include <sys/malloc.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/irongate_pci.c b/sys/arch/alpha/pci/irongate_pci.c
index edebb4a8732..f75f2189a92 100644
--- a/sys/arch/alpha/pci/irongate_pci.c
+++ b/sys/arch/alpha/pci/irongate_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: irongate_pci.c,v 1.2 2001/04/17 14:53:33 art Exp $ */
+/* $OpenBSD: irongate_pci.c,v 1.3 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: irongate_pci.c,v 1.2 2000/06/29 08:58:47 mrg Exp $ */
/*-
@@ -47,7 +47,6 @@
#include <sys/kernel.h>
#include <sys/device.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/arch/alpha/pci/lca.c b/sys/arch/alpha/pci/lca.c
index eef15f545ec..6c7fd858d18 100644
--- a/sys/arch/alpha/pci/lca.c
+++ b/sys/arch/alpha/pci/lca.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lca.c,v 1.13 2001/11/04 23:12:46 art Exp $ */
+/* $OpenBSD: lca.c,v 1.14 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: lca.c,v 1.14 1996/12/05 01:39:35 cgd Exp $ */
/*-
@@ -70,7 +70,7 @@
#include <sys/malloc.h>
#include <sys/device.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
#include <machine/rpb.h>
diff --git a/sys/arch/alpha/pci/lca_bus_io.c b/sys/arch/alpha/pci/lca_bus_io.c
index 72b99866771..ea385a25398 100644
--- a/sys/arch/alpha/pci/lca_bus_io.c
+++ b/sys/arch/alpha/pci/lca_bus_io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lca_bus_io.c,v 1.4 2001/02/16 16:02:53 jason Exp $ */
+/* $OpenBSD: lca_bus_io.c,v 1.5 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: lca_bus_io.c,v 1.8 1997/09/02 13:19:31 thorpej Exp $ */
/*
@@ -34,7 +34,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/lca_bus_mem.c b/sys/arch/alpha/pci/lca_bus_mem.c
index e7b62800bb7..64656b08f84 100644
--- a/sys/arch/alpha/pci/lca_bus_mem.c
+++ b/sys/arch/alpha/pci/lca_bus_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lca_bus_mem.c,v 1.4 2001/02/16 16:02:53 jason Exp $ */
+/* $OpenBSD: lca_bus_mem.c,v 1.5 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: lca_bus_mem.c,v 1.8 1997/09/02 13:19:32 thorpej Exp $ */
/*
@@ -34,7 +34,7 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/lca_dma.c b/sys/arch/alpha/pci/lca_dma.c
index f6be756b2ba..a2ef7daa8ea 100644
--- a/sys/arch/alpha/pci/lca_dma.c
+++ b/sys/arch/alpha/pci/lca_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lca_dma.c,v 1.2 2001/02/16 16:02:53 jason Exp $ */
+/* $OpenBSD: lca_dma.c,v 1.3 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: lca_dma.c,v 1.13 2000/06/29 08:58:47 mrg Exp $ */
/*-
@@ -50,7 +50,6 @@
#include <sys/device.h>
#include <sys/malloc.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/lca_pci.c b/sys/arch/alpha/pci/lca_pci.c
index 15575305774..10e5fa3a8f7 100644
--- a/sys/arch/alpha/pci/lca_pci.c
+++ b/sys/arch/alpha/pci/lca_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lca_pci.c,v 1.6 2001/02/16 16:02:54 jason Exp $ */
+/* $OpenBSD: lca_pci.c,v 1.7 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: lca_pci.c,v 1.13 1997/09/02 13:19:35 thorpej Exp $ */
/*
@@ -33,7 +33,7 @@
#include <sys/kernel.h>
#include <sys/device.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/autoconf.h> /* badaddr proto */
diff --git a/sys/arch/alpha/pci/pci_2100_a50.c b/sys/arch/alpha/pci/pci_2100_a50.c
index f158a869d37..335c691bdca 100644
--- a/sys/arch/alpha/pci/pci_2100_a50.c
+++ b/sys/arch/alpha/pci/pci_2100_a50.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_2100_a50.c,v 1.15 2001/08/17 22:43:19 mickey Exp $ */
+/* $OpenBSD: pci_2100_a50.c,v 1.16 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: pci_2100_a50.c,v 1.12 1996/11/13 21:13:29 cgd Exp $ */
/*
@@ -34,7 +34,7 @@
#include <sys/systm.h>
#include <sys/errno.h>
#include <sys/device.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
#include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/pci_550.c b/sys/arch/alpha/pci/pci_550.c
index 6dfe22aa2db..bab6effeca3 100644
--- a/sys/arch/alpha/pci/pci_550.c
+++ b/sys/arch/alpha/pci/pci_550.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_550.c,v 1.5 2001/08/17 22:26:58 mickey Exp $ */
+/* $OpenBSD: pci_550.c,v 1.6 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: pci_550.c,v 1.18 2000/06/29 08:58:48 mrg Exp $ */
/*-
@@ -74,7 +74,6 @@
#include <sys/device.h>
#include <sys/syslog.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
diff --git a/sys/arch/alpha/pci/pci_6600.c b/sys/arch/alpha/pci/pci_6600.c
index 69e3e9e9ffc..43166875586 100644
--- a/sys/arch/alpha/pci/pci_6600.c
+++ b/sys/arch/alpha/pci/pci_6600.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_6600.c,v 1.5 2001/08/17 22:26:58 mickey Exp $ */
+/* $OpenBSD: pci_6600.c,v 1.6 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: pci_6600.c,v 1.5 2000/06/06 00:50:15 thorpej Exp $ */
/*-
@@ -38,7 +38,6 @@
#include <sys/device.h>
#include <sys/malloc.h>
-#include <vm/vm.h>
#include <uvm/uvm.h>
#include <machine/autoconf.h>
diff --git a/sys/arch/alpha/pci/pci_axppci_33.c b/sys/arch/alpha/pci/pci_axppci_33.c
index 347df972105..dffba288334 100644
--- a/sys/arch/alpha/pci/pci_axppci_33.c
+++ b/sys/arch/alpha/pci/pci_axppci_33.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_axppci_33.c,v 1.13 2001/08/17 22:26:58 mickey Exp $ */
+/* $OpenBSD: pci_axppci_33.c,v 1.14 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: pci_axppci_33.c,v 1.10 1996/11/13 21:13:29 cgd Exp $ */
/*
@@ -34,7 +34,7 @@
#include <sys/systm.h>
#include <sys/errno.h>
#include <sys/device.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
#include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/pci_eb164.c b/sys/arch/alpha/pci/pci_eb164.c
index f7cde0c0228..2dc12c04b1c 100644
--- a/sys/arch/alpha/pci/pci_eb164.c
+++ b/sys/arch/alpha/pci/pci_eb164.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_eb164.c,v 1.10 2001/08/17 22:55:09 mickey Exp $ */
+/* $OpenBSD: pci_eb164.c,v 1.11 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: pci_eb164.c,v 1.27 2000/06/06 00:50:15 thorpej Exp $ */
/*-
@@ -74,7 +74,6 @@
#include <sys/device.h>
#include <sys/syslog.h>
-#include <vm/vm.h>
#include <uvm/uvm.h>
#include <machine/autoconf.h>
diff --git a/sys/arch/alpha/pci/pci_kn20aa.c b/sys/arch/alpha/pci/pci_kn20aa.c
index 2d40214955c..3601bb381fe 100644
--- a/sys/arch/alpha/pci/pci_kn20aa.c
+++ b/sys/arch/alpha/pci/pci_kn20aa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_kn20aa.c,v 1.14 2001/09/29 07:14:35 mickey Exp $ */
+/* $OpenBSD: pci_kn20aa.c,v 1.15 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: pci_kn20aa.c,v 1.21 1996/11/17 02:05:27 cgd Exp $ */
/*
@@ -37,7 +37,7 @@
#include <sys/device.h>
#include <sys/syslog.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
diff --git a/sys/arch/alpha/pci/pci_machdep.c b/sys/arch/alpha/pci/pci_machdep.c
index a6d7d932a69..00e3d4868da 100644
--- a/sys/arch/alpha/pci/pci_machdep.c
+++ b/sys/arch/alpha/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.c,v 1.14 2001/11/04 23:12:46 art Exp $ */
+/* $OpenBSD: pci_machdep.c,v 1.15 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: pci_machdep.c,v 1.7 1996/11/19 04:57:32 cgd Exp $ */
/*
@@ -38,7 +38,7 @@
#include <sys/systm.h>
#include <sys/errno.h>
#include <sys/device.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/cpu.h>
#include <sys/sysctl.h>
diff --git a/sys/arch/alpha/pci/pci_sgmap_pte64.c b/sys/arch/alpha/pci/pci_sgmap_pte64.c
index 325196b4b94..331b7153e49 100644
--- a/sys/arch/alpha/pci/pci_sgmap_pte64.c
+++ b/sys/arch/alpha/pci/pci_sgmap_pte64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_sgmap_pte64.c,v 1.3 2001/03/21 17:26:39 art Exp $ */
+/* $OpenBSD: pci_sgmap_pte64.c,v 1.4 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: pci_sgmap_pte64.c,v 1.4 2000/06/29 08:58:49 mrg Exp $ */
/*-
@@ -45,7 +45,6 @@
#include <sys/malloc.h>
#include <sys/proc.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/pci_up1000.c b/sys/arch/alpha/pci/pci_up1000.c
index 5422040842e..153281ebd2a 100644
--- a/sys/arch/alpha/pci/pci_up1000.c
+++ b/sys/arch/alpha/pci/pci_up1000.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_up1000.c,v 1.5 2001/08/17 22:26:58 mickey Exp $ */
+/* $OpenBSD: pci_up1000.c,v 1.6 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: pci_up1000.c,v 1.6 2000/12/28 22:59:07 sommerfeld Exp $ */
/*-
@@ -44,7 +44,6 @@
#include <sys/errno.h>
#include <sys/device.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
diff --git a/sys/arch/alpha/pci/tsp_bus_io.c b/sys/arch/alpha/pci/tsp_bus_io.c
index 56c4b9dd0eb..fbbb5681cfd 100644
--- a/sys/arch/alpha/pci/tsp_bus_io.c
+++ b/sys/arch/alpha/pci/tsp_bus_io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tsp_bus_io.c,v 1.1 2000/11/16 04:50:18 ericj Exp $ */
+/* $OpenBSD: tsp_bus_io.c,v 1.2 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: tsp_bus_io.c,v 1.4 2000/06/26 19:46:24 thorpej Exp $ */
/*-
@@ -38,7 +38,6 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/tsp_bus_mem.c b/sys/arch/alpha/pci/tsp_bus_mem.c
index 98a20a9c7a2..3ced801484b 100644
--- a/sys/arch/alpha/pci/tsp_bus_mem.c
+++ b/sys/arch/alpha/pci/tsp_bus_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tsp_bus_mem.c,v 1.2 2001/04/14 22:19:56 mjacob Exp $ */
+/* $OpenBSD: tsp_bus_mem.c,v 1.3 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: tsp_bus_mem.c,v 1.4 2000/06/26 19:46:25 thorpej Exp $ */
/*-
@@ -38,7 +38,6 @@
#include <sys/syslog.h>
#include <sys/device.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/tsp_dma.c b/sys/arch/alpha/pci/tsp_dma.c
index 21cbbaf4d7f..6935e16b905 100644
--- a/sys/arch/alpha/pci/tsp_dma.c
+++ b/sys/arch/alpha/pci/tsp_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tsp_dma.c,v 1.1 2000/11/16 04:50:18 ericj Exp $ */
+/* $OpenBSD: tsp_dma.c,v 1.2 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: tsp_dma.c,v 1.1 1999/06/29 06:46:47 ross Exp $ */
/*-
@@ -77,7 +77,6 @@
#include <sys/device.h>
#include <sys/malloc.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
diff --git a/sys/arch/alpha/pci/tsp_pci.c b/sys/arch/alpha/pci/tsp_pci.c
index 7daca3130fe..1c785a58df4 100644
--- a/sys/arch/alpha/pci/tsp_pci.c
+++ b/sys/arch/alpha/pci/tsp_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tsp_pci.c,v 1.1 2000/11/16 04:50:18 ericj Exp $ */
+/* $OpenBSD: tsp_pci.c,v 1.2 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: tsp_pci.c,v 1.1 1999/06/29 06:46:47 ross Exp $ */
/*-
@@ -37,7 +37,6 @@
#include <sys/kernel.h>
#include <sys/device.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/arch/alpha/tc/tc_bus_mem.c b/sys/arch/alpha/tc/tc_bus_mem.c
index 62b9aa23176..43a765b273c 100644
--- a/sys/arch/alpha/tc/tc_bus_mem.c
+++ b/sys/arch/alpha/tc/tc_bus_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tc_bus_mem.c,v 1.10 1997/07/19 20:44:19 niklas Exp $ */
+/* $OpenBSD: tc_bus_mem.c,v 1.11 2001/11/06 19:53:13 miod Exp $ */
/* $NetBSD: tc_bus_mem.c,v 1.13 1996/12/02 22:19:34 cgd Exp $ */
/*
@@ -37,7 +37,7 @@
#include <sys/malloc.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/bus.h>
#include <dev/tc/tcvar.h>