diff options
| author |   miod <miod@openbsd.org> | 2001-11-06 19:53:09 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2001-11-06 19:53:09 +0000 |
| commit | 489e49f965b7c1ff7f0b9f5c3828328436e699eb (patch) | |
| tree | 1da9f68efcda9c41872b0a0f4306f743570c2ba3 | |
| parent | unbreak child_return. (diff) | |
| download | wireguard-openbsd-489e49f965b7c1ff7f0b9f5c3828328436e699eb.tar.xz wireguard-openbsd-489e49f965b7c1ff7f0b9f5c3828328436e699eb.zip | |
Replace inclusion of <vm/foo.h> with the correct <uvm/bar.h> when necessary.
(Look ma, I might have broken the tree)
471 files changed, 801 insertions, 1023 deletions
diff --git a/sys/altq/altq_subr.c b/sys/altq/altq_subr.c index 8db65ff6c69..b1b53b9f45c 100644 --- a/sys/altq/altq_subr.c +++ b/sys/altq/altq_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: altq_subr.c,v 1.3 2001/09/07 08:47:23 kjc Exp $ */ +/* $OpenBSD: altq_subr.c,v 1.4 2001/11/06 19:53:09 miod Exp $ */ /* $KAME: altq_subr.c,v 1.8 2000/12/14 08:12:46 thorpej Exp $ */ /* @@ -37,7 +37,7 @@ #include <sys/kernel.h> #include <sys/errno.h> #include <sys/syslog.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/sysctl.h> #include <sys/queue.h> 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> 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> diff --git a/sys/arch/hp300/dev/grf.c b/sys/arch/hp300/dev/grf.c index b54ba27555b..feb437cb0a7 100644 --- a/sys/arch/hp300/dev/grf.c +++ b/sys/arch/hp300/dev/grf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf.c,v 1.15 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: grf.c,v 1.16 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: grf.c,v 1.30 1998/08/20 08:33:41 kleink Exp $ */ /* @@ -73,8 +73,6 @@ extern struct emul emul_hpux; #endif -#include <vm/vm.h> - #include <uvm/uvm.h> #include <miscfs/specfs/specdev.h> diff --git a/sys/arch/hp300/hp300/db_memrw.c b/sys/arch/hp300/hp300/db_memrw.c index 66ee26c9c35..1a1a62c9405 100644 --- a/sys/arch/hp300/hp300/db_memrw.c +++ b/sys/arch/hp300/hp300/db_memrw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_memrw.c,v 1.6 2001/11/04 02:58:54 miod Exp $ */ +/* $OpenBSD: db_memrw.c,v 1.7 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: db_memrw.c,v 1.5 1997/06/10 18:48:47 veego Exp $ */ /*- @@ -60,7 +60,7 @@ #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/hp300/hp300/genassym.cf b/sys/arch/hp300/hp300/genassym.cf index 5dcbd8eb2f7..da0f8ff1f3f 100644 --- a/sys/arch/hp300/hp300/genassym.cf +++ b/sys/arch/hp300/hp300/genassym.cf @@ -1,4 +1,4 @@ -# $OpenBSD: genassym.cf,v 1.13 2001/11/04 02:58:54 miod Exp $ +# $OpenBSD: genassym.cf,v 1.14 2001/11/06 19:53:14 miod Exp $ # $NetBSD: genassym.cf,v 1.11 1998/02/16 20:58:29 thorpej Exp $ # @@ -45,8 +45,6 @@ include <sys/msgbuf.h> include <sys/syscall.h> include <sys/user.h> -include <vm/vm.h> - include <uvm/uvm_extern.h> include <machine/hp300spu.h> diff --git a/sys/arch/hp300/hp300/hpux_machdep.c b/sys/arch/hp300/hp300/hpux_machdep.c index 76ce58bf874..6614bb8f05f 100644 --- a/sys/arch/hp300/hp300/hpux_machdep.c +++ b/sys/arch/hp300/hp300/hpux_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hpux_machdep.c,v 1.10 2001/08/11 23:21:13 art Exp $ */ +/* $OpenBSD: hpux_machdep.c,v 1.11 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: hpux_machdep.c,v 1.19 1998/02/16 20:58:30 thorpej Exp $ */ /* @@ -74,8 +74,6 @@ #include <machine/psl.h> #include <machine/vmparam.h> -#include <vm/vm.h> - #include <uvm/uvm_extern.h> #include <sys/syscallargs.h> diff --git a/sys/arch/hp300/hp300/intr.c b/sys/arch/hp300/hp300/intr.c index 3995d0efa7d..83bb9f239c3 100644 --- a/sys/arch/hp300/hp300/intr.c +++ b/sys/arch/hp300/hp300/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.8 2001/06/27 04:05:45 art Exp $ */ +/* $OpenBSD: intr.c,v 1.9 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: intr.c,v 1.5 1998/02/16 20:58:30 thorpej Exp $ */ /*- @@ -48,7 +48,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/hp300/hp300/leds.c b/sys/arch/hp300/hp300/leds.c index 3156cd73618..02ddbbc6cfd 100644 --- a/sys/arch/hp300/hp300/leds.c +++ b/sys/arch/hp300/hp300/leds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: leds.c,v 1.4 2001/07/25 13:25:31 art Exp $ */ +/* $OpenBSD: leds.c,v 1.5 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: leds.c,v 1.1 1997/05/05 20:54:35 thorpej Exp $ */ /* @@ -45,7 +45,7 @@ #include <sys/param.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <arch/hp300/hp300/leds.h> diff --git a/sys/arch/hp300/hp300/mem.c b/sys/arch/hp300/hp300/mem.c index 9cf245677a1..84c4b8b919f 100644 --- a/sys/arch/hp300/hp300/mem.c +++ b/sys/arch/hp300/hp300/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.16 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: mem.c,v 1.17 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: mem.c,v 1.25 1999/03/27 00:30:06 mycroft Exp $ */ /* @@ -55,7 +55,6 @@ #include <machine/cpu.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> extern u_int lowram; diff --git a/sys/arch/hp300/hp300/pmap_bootstrap.c b/sys/arch/hp300/hp300/pmap_bootstrap.c index 510f7a815e0..d383698a57e 100644 --- a/sys/arch/hp300/hp300/pmap_bootstrap.c +++ b/sys/arch/hp300/hp300/pmap_bootstrap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_bootstrap.c,v 1.10 2001/09/19 21:32:57 miod Exp $ */ +/* $OpenBSD: pmap_bootstrap.c,v 1.11 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: pmap_bootstrap.c,v 1.13 1997/06/10 18:56:50 veego Exp $ */ /* @@ -52,8 +52,8 @@ #include <hp300/hp300/clockreg.h> -#include <vm/vm.h> -#include <vm/pmap.h> +#include <uvm/uvm_extern.h> +#include <uvm/uvm_pmap.h> #define RELOC(v, t) *((t*)((u_int)&(v) + firstpa)) diff --git a/sys/arch/hp300/hp300/sys_machdep.c b/sys/arch/hp300/hp300/sys_machdep.c index 50d432f5d4a..2d04cc2d06a 100644 --- a/sys/arch/hp300/hp300/sys_machdep.c +++ b/sys/arch/hp300/hp300/sys_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_machdep.c,v 1.10 2001/11/04 02:58:54 miod Exp $ */ +/* $OpenBSD: sys_machdep.c,v 1.11 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: sys_machdep.c,v 1.17 1997/05/19 10:15:00 veego Exp $ */ /* @@ -49,7 +49,7 @@ #include <sys/buf.h> #include <sys/mount.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/syscallargs.h> diff --git a/sys/arch/hp300/hp300/trap.c b/sys/arch/hp300/hp300/trap.c index a602ad607dc..b858e3925d8 100644 --- a/sys/arch/hp300/hp300/trap.c +++ b/sys/arch/hp300/hp300/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.30 2001/11/06 18:41:09 art Exp $ */ +/* $OpenBSD: trap.c,v 1.31 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: trap.c,v 1.57 1998/02/16 20:58:31 thorpej Exp $ */ /* @@ -95,10 +95,8 @@ #include <machine/reg.h> #include <machine/intr.h> -#include <vm/vm.h> -#include <vm/pmap.h> - #include <uvm/uvm_extern.h> +#include <uvm/uvm_pmap.h> #include <dev/cons.h> diff --git a/sys/arch/hp300/hp300/vm_machdep.c b/sys/arch/hp300/hp300/vm_machdep.c index 5c1fc78828e..3d63c43b503 100644 --- a/sys/arch/hp300/hp300/vm_machdep.c +++ b/sys/arch/hp300/hp300/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.32 2001/11/06 18:41:09 art Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.33 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: vm_machdep.c,v 1.47 1999/03/26 23:41:29 mycroft Exp $ */ /* @@ -59,7 +59,6 @@ #include <machine/pte.h> #include <machine/reg.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> /* diff --git a/sys/arch/hppa/dev/clock.c b/sys/arch/hppa/dev/clock.c index b0cb32437a4..1d1a19a6afb 100644 --- a/sys/arch/hppa/dev/clock.c +++ b/sys/arch/hppa/dev/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.10 2001/08/31 03:13:42 mickey Exp $ */ +/* $OpenBSD: clock.c,v 1.11 2001/11/06 19:53:14 miod Exp $ */ /* * Copyright (c) 1998,1999 Michael Shalayeff @@ -46,7 +46,7 @@ #include <machine/autoconf.h> #if defined(DDB) -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/db_machdep.h> #include <ddb/db_sym.h> #include <ddb/db_extern.h> diff --git a/sys/arch/hppa/dev/sti_sgc.c b/sys/arch/hppa/dev/sti_sgc.c index 306ee13a973..e1edbe3d51e 100644 --- a/sys/arch/hppa/dev/sti_sgc.c +++ b/sys/arch/hppa/dev/sti_sgc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sti_sgc.c,v 1.6 2001/09/11 20:05:24 miod Exp $ */ +/* $OpenBSD: sti_sgc.c,v 1.7 2001/11/06 19:53:14 miod Exp $ */ /* * Copyright (c) 2000 Michael Shalayeff @@ -40,7 +40,6 @@ #include <sys/systm.h> #include <sys/device.h> -#include <vm/vm.h> #include <uvm/uvm.h> #include <machine/bus.h> diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c index 13c9a7b6513..e2051bd3aa0 100644 --- a/sys/arch/hppa/hppa/machdep.c +++ b/sys/arch/hppa/hppa/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.40 2001/09/19 20:50:56 mickey Exp $ */ +/* $OpenBSD: machdep.c,v 1.41 2001/11/06 19:53:14 miod Exp $ */ /* * Copyright (c) 1999-2000 Michael Shalayeff @@ -67,9 +67,8 @@ #include <sys/mount.h> #include <sys/syscallargs.h> -#include <vm/vm.h> -#include <uvm/uvm_page.h> #include <uvm/uvm.h> +#include <uvm/uvm_page.h> #include <dev/cons.h> diff --git a/sys/arch/hppa/hppa/mainbus.c b/sys/arch/hppa/hppa/mainbus.c index d1c50ad91c7..6b9e4fa1519 100644 --- a/sys/arch/hppa/hppa/mainbus.c +++ b/sys/arch/hppa/hppa/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.14 2001/11/05 17:25:57 art Exp $ */ +/* $OpenBSD: mainbus.c,v 1.15 2001/11/06 19:53:14 miod Exp $ */ /* * Copyright (c) 1998-2000 Michael Shalayeff @@ -41,9 +41,8 @@ #include <sys/extent.h> #include <sys/mbuf.h> -#include <vm/vm.h> -#include <uvm/uvm_page.h> #include <uvm/uvm.h> +#include <uvm/uvm_page.h> #include <machine/pdc.h> #include <machine/iomod.h> diff --git a/sys/arch/hppa/hppa/trap.c b/sys/arch/hppa/hppa/trap.c index 6bc8a6a0c12..cfdc92fa593 100644 --- a/sys/arch/hppa/hppa/trap.c +++ b/sys/arch/hppa/hppa/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.30 2001/09/19 20:50:56 mickey Exp $ */ +/* $OpenBSD: trap.c,v 1.31 2001/11/06 19:53:14 miod Exp $ */ /* * Copyright (c) 1998-2000 Michael Shalayeff @@ -47,7 +47,6 @@ #include <net/netisr.h> -#include <vm/vm.h> #include <uvm/uvm.h> #include <machine/iomod.h> diff --git a/sys/arch/hppa/hppa/vm_machdep.c b/sys/arch/hppa/hppa/vm_machdep.c index f7b02d18586..f8f234bca7f 100644 --- a/sys/arch/hppa/hppa/vm_machdep.c +++ b/sys/arch/hppa/hppa/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.26 2001/11/06 18:41:09 art Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.27 2001/11/06 19:53:14 miod Exp $ */ /* * Copyright (c) 1999-2000 Michael Shalayeff @@ -48,7 +48,6 @@ #include <machine/pmap.h> #include <machine/pcb.h> -#include <vm/vm.h> #include <uvm/uvm.h> diff --git a/sys/arch/hppa/include/db_machdep.h b/sys/arch/hppa/include/db_machdep.h index 6976ffb7676..bf497044a8e 100644 --- a/sys/arch/hppa/include/db_machdep.h +++ b/sys/arch/hppa/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.5 2001/02/16 19:20:13 mickey Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.6 2001/11/06 19:53:14 miod Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -33,7 +33,7 @@ #ifndef _MACHINE_DB_MACHDEP_H_ #define _MACHINE_DB_MACHDEP_H_ -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #define DB_ELF_SYMBOLS #define DB_ELFSIZE 32 diff --git a/sys/arch/i386/i386/bios.c b/sys/arch/i386/i386/bios.c index c95b80043a2..59516efacc8 100644 --- a/sys/arch/i386/i386/bios.c +++ b/sys/arch/i386/i386/bios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bios.c,v 1.46 2001/09/19 20:50:56 mickey Exp $ */ +/* $OpenBSD: bios.c,v 1.47 2001/11/06 19:53:14 miod Exp $ */ /* * Copyright (c) 1997-2001 Michael Shalayeff @@ -43,7 +43,6 @@ #include <sys/reboot.h> #include <sys/extent.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <sys/sysctl.h> diff --git a/sys/arch/i386/i386/db_interface.c b/sys/arch/i386/i386/db_interface.c index 227d8e56454..1b648639bd2 100644 --- a/sys/arch/i386/i386/db_interface.c +++ b/sys/arch/i386/i386/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.8 2000/07/05 14:26:34 hugh Exp $ */ +/* $OpenBSD: db_interface.c,v 1.9 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: db_interface.c,v 1.22 1996/05/03 19:42:00 christos Exp $ */ /* @@ -37,7 +37,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/i386/i386/db_memrw.c b/sys/arch/i386/i386/db_memrw.c index 6318d2edbce..9e17d2a2429 100644 --- a/sys/arch/i386/i386/db_memrw.c +++ b/sys/arch/i386/i386/db_memrw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_memrw.c,v 1.3 2001/05/05 23:25:35 art Exp $ */ +/* $OpenBSD: db_memrw.c,v 1.4 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: db_memrw.c,v 1.6 1999/04/12 20:38:19 pk Exp $ */ /* @@ -38,7 +38,7 @@ #include <sys/proc.h> #include <sys/systm.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/db_machdep.h> diff --git a/sys/arch/i386/i386/freebsd_machdep.c b/sys/arch/i386/i386/freebsd_machdep.c index e885f47e3bd..ebc5c51fba1 100644 --- a/sys/arch/i386/i386/freebsd_machdep.c +++ b/sys/arch/i386/i386/freebsd_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: freebsd_machdep.c,v 1.11 2001/02/03 02:46:28 mickey Exp $ */ +/* $OpenBSD: freebsd_machdep.c,v 1.12 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: freebsd_machdep.c,v 1.10 1996/05/03 19:42:05 christos Exp $ */ /*- @@ -49,7 +49,7 @@ #include <sys/exec.h> #include <sys/mount.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/cpufunc.h> #include <machine/npx.h> diff --git a/sys/arch/i386/i386/gdt.c b/sys/arch/i386/i386/gdt.c index d5c42fc8078..2950959304f 100644 --- a/sys/arch/i386/i386/gdt.c +++ b/sys/arch/i386/i386/gdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gdt.c,v 1.16 2001/09/19 20:50:56 mickey Exp $ */ +/* $OpenBSD: gdt.c,v 1.17 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: gdt.c,v 1.8 1996/05/03 19:42:06 christos Exp $ */ /*- @@ -42,7 +42,6 @@ #include <sys/proc.h> #include <sys/user.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <machine/gdt.h> diff --git a/sys/arch/i386/i386/genassym.cf b/sys/arch/i386/i386/genassym.cf index 0df70c1582b..842f3d7dc95 100644 --- a/sys/arch/i386/i386/genassym.cf +++ b/sys/arch/i386/i386/genassym.cf @@ -1,4 +1,4 @@ -# $OpenBSD: genassym.cf,v 1.10 2001/09/16 14:28:04 miod Exp $ +# $OpenBSD: genassym.cf,v 1.11 2001/11/06 19:53:14 miod Exp $ # # Copyright (c) 1982, 1990 The Regents of the University of California. # All rights reserved. @@ -43,8 +43,6 @@ ifdef INET include <sys/mbuf.h> endif -include <vm/vm.h> - include <uvm/uvm_extern.h> include <machine/trap.h> diff --git a/sys/arch/i386/i386/kgdb_machdep.c b/sys/arch/i386/i386/kgdb_machdep.c index 690c83a794e..fc74f997647 100644 --- a/sys/arch/i386/i386/kgdb_machdep.c +++ b/sys/arch/i386/i386/kgdb_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kgdb_machdep.c,v 1.1 2001/01/24 09:37:58 hugh Exp $ */ +/* $OpenBSD: kgdb_machdep.c,v 1.2 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: kgdb_machdep.c,v 1.6 1998/08/13 21:36:03 thorpej Exp $ */ /*- @@ -82,7 +82,7 @@ #include <sys/kgdb.h> #include <sys/systm.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/pte.h> #include <machine/reg.h> diff --git a/sys/arch/i386/i386/mem.c b/sys/arch/i386/i386/mem.c index c3070705798..ae404ead9f9 100644 --- a/sys/arch/i386/i386/mem.c +++ b/sys/arch/i386/i386/mem.c @@ -1,5 +1,5 @@ /* $NetBSD: mem.c,v 1.31 1996/05/03 19:42:19 christos Exp $ */ -/* $OpenBSD: mem.c,v 1.20 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: mem.c,v 1.21 2001/11/06 19:53:14 miod Exp $ */ /* * Copyright (c) 1988 University of Utah. * Copyright (c) 1982, 1986, 1990, 1993 @@ -57,8 +57,6 @@ #include <machine/cpu.h> #include <machine/conf.h> -#include <vm/vm.h> - #include <uvm/uvm_extern.h> #include "mtrr.h" diff --git a/sys/arch/i386/i386/sys_machdep.c b/sys/arch/i386/i386/sys_machdep.c index 693baee9456..508a4a26088 100644 --- a/sys/arch/i386/i386/sys_machdep.c +++ b/sys/arch/i386/i386/sys_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_machdep.c,v 1.15 2001/09/19 20:50:56 mickey Exp $ */ +/* $OpenBSD: sys_machdep.c,v 1.16 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: sys_machdep.c,v 1.28 1996/05/03 19:42:29 christos Exp $ */ /*- @@ -57,7 +57,6 @@ #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/i386/i386/vm_machdep.c b/sys/arch/i386/i386/vm_machdep.c index 1f9bbce2f03..516dea6ebea 100644 --- a/sys/arch/i386/i386/vm_machdep.c +++ b/sys/arch/i386/i386/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.31 2001/11/06 18:41:09 art Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.32 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: vm_machdep.c,v 1.61 1996/05/03 19:42:35 christos Exp $ */ /*- @@ -58,7 +58,6 @@ #include <sys/exec.h> #include <sys/ptrace.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <machine/cpu.h> diff --git a/sys/arch/i386/include/db_machdep.h b/sys/arch/i386/include/db_machdep.h index 277477aed04..ee32ef6556d 100644 --- a/sys/arch/i386/include/db_machdep.h +++ b/sys/arch/i386/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.5 2001/01/24 09:38:01 hugh Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.6 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: db_machdep.h,v 1.9 1996/05/03 19:23:59 christos Exp $ */ /* @@ -35,7 +35,7 @@ */ #include <sys/param.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/trap.h> typedef vaddr_t db_addr_t; /* address - unsigned */ diff --git a/sys/arch/i386/isa/isa_machdep.c b/sys/arch/i386/isa/isa_machdep.c index 13cdd3ff3cb..bf93ba716a3 100644 --- a/sys/arch/i386/isa/isa_machdep.c +++ b/sys/arch/i386/isa/isa_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.c,v 1.39 2001/11/05 17:25:57 art Exp $ */ +/* $OpenBSD: isa_machdep.c,v 1.40 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $ */ #define ISA_DMA_STATS @@ -124,7 +124,7 @@ #include <sys/malloc.h> #include <sys/proc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #define _I386_BUS_DMA_PRIVATE #include <machine/bus.h> diff --git a/sys/arch/i386/isa/npx.c b/sys/arch/i386/isa/npx.c index 73f7833686f..a446ab4efc9 100644 --- a/sys/arch/i386/isa/npx.c +++ b/sys/arch/i386/isa/npx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: npx.c,v 1.19 2001/05/05 23:25:51 art Exp $ */ +/* $OpenBSD: npx.c,v 1.20 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: npx.c,v 1.57 1996/05/12 23:12:24 mycroft Exp $ */ #if 0 @@ -54,7 +54,6 @@ #include <sys/ioctl.h> #include <sys/device.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <machine/cpu.h> diff --git a/sys/arch/i386/pci/pci_machdep.c b/sys/arch/i386/pci/pci_machdep.c index 8f0804b225d..d0ea039a240 100644 --- a/sys/arch/i386/pci/pci_machdep.c +++ b/sys/arch/i386/pci/pci_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.c,v 1.21 2001/09/11 20:05:24 miod Exp $ */ +/* $OpenBSD: pci_machdep.c,v 1.22 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: pci_machdep.c,v 1.28 1997/06/06 23:29:17 thorpej Exp $ */ /*- @@ -87,7 +87,7 @@ #include <sys/errno.h> #include <sys/device.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #define _I386_BUS_DMA_PRIVATE #include <machine/bus.h> diff --git a/sys/arch/i386/stand/installboot/installboot.c b/sys/arch/i386/stand/installboot/installboot.c index 103f5d000dc..2add3ed9762 100644 --- a/sys/arch/i386/stand/installboot/installboot.c +++ b/sys/arch/i386/stand/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.34 1999/05/23 17:19:22 aaron Exp $ */ +/* $OpenBSD: installboot.c,v 1.35 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -44,7 +44,7 @@ #include <ufs/ffs/fs.h> #include <sys/reboot.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/sysctl.h> #include <machine/cpu.h> diff --git a/sys/arch/m68k/m68k/db_interface.c b/sys/arch/m68k/m68k/db_interface.c index 69600141770..59a81c7558b 100644 --- a/sys/arch/m68k/m68k/db_interface.c +++ b/sys/arch/m68k/m68k/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.10 2000/01/01 22:18:54 deraadt Exp $ */ +/* $OpenBSD: db_interface.c,v 1.11 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: db_interface.c,v 1.24 1997/02/18 22:27:32 gwr Exp $ */ /* @@ -35,7 +35,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 6afce7cde0a..2acefaf108d 100644 --- a/sys/arch/m68k/m68k/db_memrw.c +++ b/sys/arch/m68k/m68k/db_memrw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_memrw.c,v 1.2 2001/05/15 01:43:15 millert Exp $ */ +/* $OpenBSD: db_memrw.c,v 1.3 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: db_memrw.c,v 1.1 1996/02/22 23:23:35 gwr Exp $ */ /* @@ -41,7 +41,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 45a52328309..47fb5ded5e9 100644 --- a/sys/arch/m68k/m68k/mappedcopy.c +++ b/sys/arch/m68k/m68k/mappedcopy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mappedcopy.c,v 1.7 2001/09/11 20:05:24 miod Exp $ */ +/* $OpenBSD: mappedcopy.c,v 1.8 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: mappedcopy.c,v 1.1 1997/02/02 06:54:10 thorpej Exp $ */ /* @@ -51,7 +51,7 @@ #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/sig_machdep.c b/sys/arch/m68k/m68k/sig_machdep.c index 5388127843f..2cebd4d7cc8 100644 --- a/sys/arch/m68k/m68k/sig_machdep.c +++ b/sys/arch/m68k/m68k/sig_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sig_machdep.c,v 1.6 2001/06/27 04:39:06 art Exp $ */ +/* $OpenBSD: sig_machdep.c,v 1.7 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: sig_machdep.c,v 1.3 1997/04/30 23:28:03 gwr Exp $ */ /* @@ -84,7 +84,6 @@ #include <sys/malloc.h> #include <sys/buf.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <sys/syscallargs.h> diff --git a/sys/arch/mac68k/dev/asc.c b/sys/arch/mac68k/dev/asc.c index b587b2b446e..0806cce19d5 100644 --- a/sys/arch/mac68k/dev/asc.c +++ b/sys/arch/mac68k/dev/asc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asc.c,v 1.12 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: asc.c,v 1.13 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: asc.c,v 1.20 1997/02/24 05:47:33 scottr Exp $ */ /* @@ -78,8 +78,8 @@ #include <sys/fcntl.h> #include <sys/timeout.h> -#include <vm/vm.h> -#include <vm/pmap.h> +#include <uvm/uvm_extern.h> +#include <uvm/uvm_pmap.h> #include <machine/autoconf.h> #include <machine/cpu.h> diff --git a/sys/arch/mac68k/dev/grf.c b/sys/arch/mac68k/dev/grf.c index 19e2ebd6cbf..dd1f3434a1a 100644 --- a/sys/arch/mac68k/dev/grf.c +++ b/sys/arch/mac68k/dev/grf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf.c,v 1.17 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: grf.c,v 1.18 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: grf.c,v 1.41 1997/02/24 06:20:04 scottr Exp $ */ /* @@ -67,8 +67,6 @@ #include <miscfs/specfs/specdev.h> -#include <vm/vm.h> - #include <uvm/uvm.h> #include "nubus.h" diff --git a/sys/arch/mac68k/dev/if_mc.c b/sys/arch/mac68k/dev/if_mc.c index 4439338e255..45e19e78de1 100644 --- a/sys/arch/mac68k/dev/if_mc.c +++ b/sys/arch/mac68k/dev/if_mc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mc.c,v 1.4 2001/07/09 22:41:14 fgsch Exp $ */ +/* $OpenBSD: if_mc.c,v 1.5 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: if_mc.c,v 1.4 1998/01/12 19:22:09 thorpej Exp $ */ /*- @@ -70,7 +70,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_mc_obio.c b/sys/arch/mac68k/dev/if_mc_obio.c index 84302a88e08..37e122cda22 100644 --- a/sys/arch/mac68k/dev/if_mc_obio.c +++ b/sys/arch/mac68k/dev/if_mc_obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mc_obio.c,v 1.1 1998/05/08 22:15:32 gene Exp $ */ +/* $OpenBSD: if_mc_obio.c,v 1.2 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: if_mc_obio.c,v 1.4 1998/01/13 19:24:54 scottr Exp $ */ /*- @@ -47,7 +47,7 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/bus.h> #include <machine/cpu.h> diff --git a/sys/arch/mac68k/dev/if_sn.c b/sys/arch/mac68k/dev/if_sn.c index 4cc14de3efa..849844f0e8c 100644 --- a/sys/arch/mac68k/dev/if_sn.c +++ b/sys/arch/mac68k/dev/if_sn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sn.c,v 1.29 2001/07/04 08:52:45 niklas Exp $ */ +/* $OpenBSD: if_sn.c,v 1.30 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: if_sn.c,v 1.13 1997/04/25 03:40:10 briggs Exp $ */ /* @@ -39,7 +39,7 @@ #include <netinet/if_ether.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include "bpfilter.h" #if NBPFILTER > 0 diff --git a/sys/arch/mac68k/dev/ite.c b/sys/arch/mac68k/dev/ite.c index 90ea12baed0..6b66a9c3cc4 100644 --- a/sys/arch/mac68k/dev/ite.c +++ b/sys/arch/mac68k/dev/ite.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ite.c,v 1.18 2001/06/08 08:08:59 art Exp $ */ +/* $OpenBSD: ite.c,v 1.19 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: ite.c,v 1.32 1997/02/20 00:23:25 scottr Exp $ */ /* @@ -76,8 +76,8 @@ #include <machine/iteioctl.h> #include <machine/grfioctl.h> -#include <vm/vm.h> -#include <vm/pmap.h> +#include <uvm/uvm_extern.h> +#include <uvm/uvm_pmap.h> #include "../mac68k/macrom.h" diff --git a/sys/arch/mac68k/dev/nubus.c b/sys/arch/mac68k/dev/nubus.c index fcc0016941e..b6b48029a90 100644 --- a/sys/arch/mac68k/dev/nubus.c +++ b/sys/arch/mac68k/dev/nubus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nubus.c,v 1.21 2001/09/19 20:50:56 mickey Exp $ */ +/* $OpenBSD: nubus.c,v 1.22 2001/11/06 19:53:14 miod Exp $ */ /* $NetBSD: nubus.c,v 1.35 1997/04/22 20:20:32 scottr Exp $ */ /* @@ -37,7 +37,6 @@ #include <sys/conf.h> #include <sys/dmap.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <machine/autoconf.h> diff --git a/sys/arch/mac68k/mac68k/bus_space.c b/sys/arch/mac68k/mac68k/bus_space.c index 5d191166de8..26977323e48 100644 --- a/sys/arch/mac68k/mac68k/bus_space.c +++ b/sys/arch/mac68k/mac68k/bus_space.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_space.c,v 1.11 2001/09/19 20:50:56 mickey Exp $ */ +/* $OpenBSD: bus_space.c,v 1.12 2001/11/06 19:53:15 miod Exp $ */ /* $NetBSD: bus_space.c,v 1.5 1999/03/26 23:41:30 mycroft Exp $ */ /*- @@ -49,7 +49,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 6eca3957415..723564cf60c 100644 --- a/sys/arch/mac68k/mac68k/genassym.cf +++ b/sys/arch/mac68k/mac68k/genassym.cf @@ -1,4 +1,4 @@ -# $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:15 miod Exp $ # $NetBSD: genassym.cf,v 1.7 1998/01/06 08:46:16 thorpej Exp $ # @@ -46,8 +46,6 @@ include <sys/systm.h> include <sys/types.h> include <sys/user.h> -include <vm/vm.h> - include <uvm/uvm_extern.h> include <machine/cpu.h> diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c index 9ddcb8f2906..125f24ec8b7 100644 --- a/sys/arch/mac68k/mac68k/machdep.c +++ b/sys/arch/mac68k/mac68k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.83 2001/09/19 20:50:56 mickey Exp $ */ +/* $OpenBSD: machdep.c,v 1.84 2001/11/06 19:53:15 miod Exp $ */ /* $NetBSD: machdep.c,v 1.207 1998/07/08 04:39:34 thorpej Exp $ */ /* @@ -129,7 +129,6 @@ void netintr __P((void)); #define MAXMEM 64*1024 /* XXX - from cmap.h */ -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <sys/sysctl.h> diff --git a/sys/arch/mac68k/mac68k/macrom.c b/sys/arch/mac68k/mac68k/macrom.c index 0fbb99c94cb..c12a461f59b 100644 --- a/sys/arch/mac68k/mac68k/macrom.c +++ b/sys/arch/mac68k/mac68k/macrom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macrom.c,v 1.21 2001/08/11 22:59:37 art Exp $ */ +/* $OpenBSD: macrom.c,v 1.22 2001/11/06 19:53:15 miod Exp $ */ /* $NetBSD: macrom.c,v 1.31 1997/03/01 17:20:34 scottr Exp $ */ /*- @@ -51,7 +51,7 @@ #include <sys/queue.h> #include <sys/lock.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/viareg.h> #include "macrom.h" diff --git a/sys/arch/mac68k/mac68k/mem.c b/sys/arch/mac68k/mac68k/mem.c index 764078ea26f..d6c350ad79a 100644 --- a/sys/arch/mac68k/mac68k/mem.c +++ b/sys/arch/mac68k/mac68k/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.15 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: mem.c,v 1.16 2001/11/06 19:53:15 miod Exp $ */ /* $NetBSD: mem.c,v 1.22 1999/03/27 00:30:07 mycroft Exp $ */ /* @@ -55,8 +55,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_bootstrap.c b/sys/arch/mac68k/mac68k/pmap_bootstrap.c index 83a7319fa59..ad16d8e0dba 100644 --- a/sys/arch/mac68k/mac68k/pmap_bootstrap.c +++ b/sys/arch/mac68k/mac68k/pmap_bootstrap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_bootstrap.c,v 1.14 2001/05/08 17:30:41 aaron Exp $ */ +/* $OpenBSD: pmap_bootstrap.c,v 1.15 2001/11/06 19:53:15 miod Exp $ */ /* $NetBSD: pmap_bootstrap.c,v 1.50 1999/04/07 06:14:33 scottr Exp $ */ /* @@ -45,7 +45,7 @@ #include <sys/msgbuf.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/trap.c b/sys/arch/mac68k/mac68k/trap.c index fdd648b8e2d..cb3edc452f2 100644 --- a/sys/arch/mac68k/mac68k/trap.c +++ b/sys/arch/mac68k/mac68k/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.29 2001/11/06 18:41:10 art Exp $ */ +/* $OpenBSD: trap.c,v 1.30 2001/11/06 19:53:15 miod Exp $ */ /* $NetBSD: trap.c,v 1.68 1998/12/22 08:47:07 scottr Exp $ */ /* @@ -71,10 +71,8 @@ #include <m68k/fpe/fpu_emulate.h> -#include <vm/vm.h> -#include <vm/pmap.h> - #include <uvm/uvm_extern.h> +#include <uvm/uvm_pmap.h> #ifdef COMPAT_SUNOS #include <compat/sunos/sunos_syscall.h> diff --git a/sys/arch/mac68k/mac68k/vm_machdep.c b/sys/arch/mac68k/mac68k/vm_machdep.c index 6896e457e29..5981c3d3f9d 100644 --- a/sys/arch/mac68k/mac68k/vm_machdep.c +++ b/sys/arch/mac68k/mac68k/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.25 2001/11/06 18:41:10 art Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.26 2001/11/06 19:53:15 miod Exp $ */ /* $NetBSD: vm_machdep.c,v 1.29 1998/07/28 18:34:55 thorpej Exp $ */ /* @@ -55,8 +55,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/macppc/dev/dbdma.c b/sys/arch/macppc/dev/dbdma.c index e936ad7a2e1..2756fb9a48c 100644 --- a/sys/arch/macppc/dev/dbdma.c +++ b/sys/arch/macppc/dev/dbdma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dbdma.c,v 1.3 2001/09/15 01:51:11 mickey Exp $ */ +/* $OpenBSD: dbdma.c,v 1.4 2001/11/06 19:53:15 miod Exp $ */ /* $NetBSD: dbdma.c,v 1.2 1998/08/21 16:13:28 tsubai Exp $ */ /* @@ -27,7 +27,7 @@ #include <sys/malloc.h> #include <sys/systm.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/bus.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 5f7e8b9f0fb..2de5d04879d 100644 --- a/sys/arch/macppc/dev/if_bm.c +++ b/sys/arch/macppc/dev/if_bm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bm.c,v 1.4 2001/09/16 03:19:30 drahn Exp $ */ +/* $OpenBSD: if_bm.c,v 1.5 2001/11/06 19:53:15 miod Exp $ */ /* $NetBSD: if_bm.c,v 1.1 1999/01/01 01:27:52 tsubai Exp $ */ /*- @@ -52,7 +52,7 @@ #include <net/bpfdesc.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <dev/mii/mii.h> #include <dev/mii/miivar.h> diff --git a/sys/arch/macppc/dev/if_gm.c b/sys/arch/macppc/dev/if_gm.c index 95336155633..dfd6e1e282d 100644 --- a/sys/arch/macppc/dev/if_gm.c +++ b/sys/arch/macppc/dev/if_gm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gm.c,v 1.3 2001/09/05 16:54:01 mickey Exp $ */ +/* $OpenBSD: if_gm.c,v 1.4 2001/11/06 19:53:15 miod Exp $ */ /* $NetBSD: if_gm.c,v 1.14 2001/07/22 11:29:46 wiz Exp $ */ /*- @@ -41,7 +41,7 @@ #include <sys/socket.h> #include <sys/systm.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <net/if.h> #include <netinet/in.h> diff --git a/sys/arch/macppc/dev/macintr.c b/sys/arch/macppc/dev/macintr.c index 4e0f5cc1379..f923b274944 100644 --- a/sys/arch/macppc/dev/macintr.c +++ b/sys/arch/macppc/dev/macintr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macintr.c,v 1.5 2001/10/03 14:07:05 drahn Exp $ */ +/* $OpenBSD: macintr.c,v 1.6 2001/11/06 19:53:15 miod Exp $ */ /*- * Copyright (c) 1995 Per Fogelstrom @@ -47,7 +47,6 @@ #include <sys/socket.h> #include <sys/systm.h> -#include <vm/vm.h> #include <uvm/uvm.h> #include <machine/autoconf.h> diff --git a/sys/arch/macppc/dev/mesh.c b/sys/arch/macppc/dev/mesh.c index f5437892893..f846159524a 100644 --- a/sys/arch/macppc/dev/mesh.c +++ b/sys/arch/macppc/dev/mesh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mesh.c,v 1.2 2001/09/15 01:51:11 mickey Exp $ */ +/* $OpenBSD: mesh.c,v 1.3 2001/11/06 19:53:15 miod Exp $ */ /* $NetBSD: mesh.c,v 1.1 1999/02/19 13:06:03 tsubai Exp $ */ /*- @@ -41,8 +41,7 @@ #include <sys/queue.h> #include <sys/systm.h> -#include <vm/vm.h> - +#include <uvm/uvm_extern.h> #include <scsi/scsi_all.h> #include <scsi/scsiconf.h> diff --git a/sys/arch/macppc/dev/openpic.c b/sys/arch/macppc/dev/openpic.c index b4eceb54352..ea6cf258f2d 100644 --- a/sys/arch/macppc/dev/openpic.c +++ b/sys/arch/macppc/dev/openpic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: openpic.c,v 1.6 2001/10/03 14:07:05 drahn Exp $ */ +/* $OpenBSD: openpic.c,v 1.7 2001/11/06 19:53:15 miod Exp $ */ /*- * Copyright (c) 1995 Per Fogelstrom @@ -47,7 +47,6 @@ #include <sys/socket.h> #include <sys/systm.h> -#include <vm/vm.h> #include <uvm/uvm.h> #include <machine/autoconf.h> diff --git a/sys/arch/macppc/dev/wdc_obio.c b/sys/arch/macppc/dev/wdc_obio.c index b7d81a99518..7fa3316321f 100644 --- a/sys/arch/macppc/dev/wdc_obio.c +++ b/sys/arch/macppc/dev/wdc_obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdc_obio.c,v 1.3 2001/09/15 01:51:11 mickey Exp $ */ +/* $OpenBSD: wdc_obio.c,v 1.4 2001/11/06 19:53:15 miod Exp $ */ /* $NetBSD: wdc_obio.c,v 1.15 2001/07/25 20:26:33 bouyer Exp $ */ /*- @@ -42,7 +42,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/db_memrw.c b/sys/arch/macppc/macppc/db_memrw.c index 226c2417bfd..d8dc2405755 100644 --- a/sys/arch/macppc/macppc/db_memrw.c +++ b/sys/arch/macppc/macppc/db_memrw.c @@ -1,5 +1,5 @@ /* $NetBSD: db_memrw.c,v 1.4 2001/05/18 20:38:27 matt Exp $ */ -/* $OpenBSD: db_memrw.c,v 1.2 2001/09/09 23:56:40 drahn Exp $ */ +/* $OpenBSD: db_memrw.c,v 1.3 2001/11/06 19:53:15 miod Exp $ */ /* * Mach Operating System @@ -42,7 +42,7 @@ #include <sys/proc.h> #include <sys/systm.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/db_machdep.h> #include <machine/pcb.h> diff --git a/sys/arch/macppc/macppc/dma.c b/sys/arch/macppc/macppc/dma.c index c7b1b7198f6..322081c5f34 100644 --- a/sys/arch/macppc/macppc/dma.c +++ b/sys/arch/macppc/macppc/dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dma.c,v 1.4 2001/11/05 17:25:58 art Exp $ */ +/* $OpenBSD: dma.c,v 1.5 2001/11/06 19:53:15 miod Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -51,7 +51,6 @@ #include <sys/mbuf.h> #include <sys/mount.h> -#include <vm/vm.h> #include <uvm/uvm.h> #include <uvm/uvm_page.h> diff --git a/sys/arch/macppc/macppc/genassym.cf b/sys/arch/macppc/macppc/genassym.cf index 9f649b1acf2..9d3aa02c871 100644 --- a/sys/arch/macppc/macppc/genassym.cf +++ b/sys/arch/macppc/macppc/genassym.cf @@ -1,4 +1,4 @@ -# $OpenBSD: genassym.cf,v 1.3 2001/09/16 14:28:04 miod Exp $ +# $OpenBSD: genassym.cf,v 1.4 2001/11/06 19:53:15 miod Exp $ # # Copyright (c) 1982, 1990 The Regents of the University of California. # All rights reserved. @@ -37,7 +37,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 ec843d7ad35..ee8527df884 100644 --- a/sys/arch/macppc/macppc/machdep.c +++ b/sys/arch/macppc/macppc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.10 2001/11/05 22:26:57 drahn Exp $ */ +/* $OpenBSD: machdep.c,v 1.11 2001/11/06 19:53:15 miod Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -53,7 +53,6 @@ #include <sys/systm.h> #include <sys/user.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #ifdef SYSVSHM diff --git a/sys/arch/macppc/macppc/mem.c b/sys/arch/macppc/macppc/mem.c index 5c56aa1d18e..a35222c0271 100644 --- a/sys/arch/macppc/macppc/mem.c +++ b/sys/arch/macppc/macppc/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.2 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: mem.c,v 1.3 2001/11/06 19:53:15 miod Exp $ */ /* $NetBSD: mem.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */ /* @@ -55,7 +55,6 @@ #include <machine/cpu.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <machine/conf.h> diff --git a/sys/arch/macppc/macppc/ofw_machdep.c b/sys/arch/macppc/macppc/ofw_machdep.c index c2e98403d94..1cdc61e33fd 100644 --- a/sys/arch/macppc/macppc/ofw_machdep.c +++ b/sys/arch/macppc/macppc/ofw_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofw_machdep.c,v 1.3 2001/10/01 22:47:48 drahn Exp $ */ +/* $OpenBSD: ofw_machdep.c,v 1.4 2001/11/06 19:53:15 miod Exp $ */ /* $NetBSD: ofw_machdep.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */ /* @@ -43,7 +43,7 @@ #include <sys/stat.h> #include <sys/systm.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/powerpc.h> #include <machine/autoconf.h> diff --git a/sys/arch/macppc/pci/mpcpcibus.c b/sys/arch/macppc/pci/mpcpcibus.c index cc1f25ca5f4..74b5160ba29 100644 --- a/sys/arch/macppc/pci/mpcpcibus.c +++ b/sys/arch/macppc/pci/mpcpcibus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpcpcibus.c,v 1.2 2001/09/21 02:11:58 miod Exp $ */ +/* $OpenBSD: mpcpcibus.c,v 1.3 2001/11/06 19:53:15 miod Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -43,7 +43,7 @@ #include <sys/malloc.h> #include <sys/device.h> #include <sys/proc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/autoconf.h> #include <machine/bat.h> diff --git a/sys/arch/macppc/pci/vgafb.c b/sys/arch/macppc/pci/vgafb.c index 0e5cdb868d4..1a4c448dcb5 100644 --- a/sys/arch/macppc/pci/vgafb.c +++ b/sys/arch/macppc/pci/vgafb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vgafb.c,v 1.3 2001/09/17 15:10:36 drahn Exp $ */ +/* $OpenBSD: vgafb.c,v 1.4 2001/11/06 19:53:15 miod Exp $ */ /* $NetBSD: vga.c,v 1.3 1996/12/02 22:24:54 cgd Exp $ */ /* @@ -34,7 +34,6 @@ #include <sys/device.h> #include <sys/buf.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <machine/bus.h> diff --git a/sys/arch/mvme68k/dev/if_ie.c b/sys/arch/mvme68k/dev/if_ie.c index 8dcd3dc76ba..5e8d289a2ef 100644 --- a/sys/arch/mvme68k/dev/if_ie.c +++ b/sys/arch/mvme68k/dev/if_ie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie.c,v 1.15 2001/08/08 21:01:05 miod Exp $ */ +/* $OpenBSD: if_ie.c,v 1.16 2001/11/06 19:53:15 miod Exp $ */ /*- * Copyright (c) 1999 Steve Murphree, Jr. @@ -128,7 +128,7 @@ Mode of operation: #include <netinet/if_ether.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/autoconf.h> #include <machine/cpu.h> diff --git a/sys/arch/mvme68k/dev/sbicdma.c b/sys/arch/mvme68k/dev/sbicdma.c index cecb7ef21cb..8d7bdeff949 100644 --- a/sys/arch/mvme68k/dev/sbicdma.c +++ b/sys/arch/mvme68k/dev/sbicdma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbicdma.c,v 1.5 2001/06/08 08:09:07 art Exp $ */ +/* $OpenBSD: sbicdma.c,v 1.6 2001/11/06 19:53:15 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -43,7 +43,7 @@ #include <sys/device.h> #include <sys/proc.h> #include <sys/conf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <scsi/scsi_all.h> #include <scsi/scsiconf.h> diff --git a/sys/arch/mvme68k/dev/sram.c b/sys/arch/mvme68k/dev/sram.c index 09228b823b9..97145cb2582 100644 --- a/sys/arch/mvme68k/dev/sram.c +++ b/sys/arch/mvme68k/dev/sram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sram.c,v 1.6 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: sram.c,v 1.7 2001/11/06 19:53:15 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -50,7 +50,7 @@ #include <mvme68k/dev/mcreg.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> struct sramsoftc { struct device sc_dev; diff --git a/sys/arch/mvme68k/mvme68k/genassym.cf b/sys/arch/mvme68k/mvme68k/genassym.cf index a0589f7736b..55e52a6bce8 100644 --- a/sys/arch/mvme68k/mvme68k/genassym.cf +++ b/sys/arch/mvme68k/mvme68k/genassym.cf @@ -1,4 +1,4 @@ -# $OpenBSD: genassym.cf,v 1.12 2001/09/16 14:28:04 miod Exp $ +# $OpenBSD: genassym.cf,v 1.13 2001/11/06 19:53:15 miod Exp $ # # Copyright (c) 1995 Theo de Raadt @@ -73,8 +73,6 @@ include <sys/syscall.h> include <sys/types.h> include <sys/user.h> -include <vm/vm.h> - include <uvm/uvm_extern.h> include <machine/cpu.h> diff --git a/sys/arch/mvme68k/mvme68k/hpux_machdep.c b/sys/arch/mvme68k/mvme68k/hpux_machdep.c index 412fef63467..33857609b2b 100644 --- a/sys/arch/mvme68k/mvme68k/hpux_machdep.c +++ b/sys/arch/mvme68k/mvme68k/hpux_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hpux_machdep.c,v 1.4 2001/08/11 23:21:13 art Exp $ */ +/* $OpenBSD: hpux_machdep.c,v 1.5 2001/11/06 19:53:15 miod Exp $ */ /* $NetBSD: hpux_machdep.c,v 1.9 1997/03/16 10:00:45 thorpej Exp $ */ /* @@ -72,8 +72,6 @@ #include <machine/psl.h> #include <machine/vmparam.h> -#include <vm/vm.h> - #include <uvm/uvm_extern.h> #include <machine/cpu.h> diff --git a/sys/arch/mvme68k/mvme68k/mem.c b/sys/arch/mvme68k/mvme68k/mem.c index 3a58c6c6986..443b8a1f9a8 100644 --- a/sys/arch/mvme68k/mvme68k/mem.c +++ b/sys/arch/mvme68k/mvme68k/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.16 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: mem.c,v 1.17 2001/11/06 19:53:15 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -82,7 +82,6 @@ #include <machine/cpu.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> extern u_int lowram; diff --git a/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c b/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c index 3f0f296ba7b..be935de96c9 100644 --- a/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c +++ b/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_bootstrap.c,v 1.7 2001/04/05 20:39:40 deraadt Exp $ */ +/* $OpenBSD: pmap_bootstrap.c,v 1.8 2001/11/06 19:53:15 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -76,7 +76,7 @@ #include <machine/cpu.h> #include <machine/autoconf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #define RELOC(v, t) *((t*)((u_int)&(v) + firstpa)) diff --git a/sys/arch/mvme68k/mvme68k/sys_machdep.c b/sys/arch/mvme68k/mvme68k/sys_machdep.c index 94d13dbd300..6133bb2f334 100644 --- a/sys/arch/mvme68k/mvme68k/sys_machdep.c +++ b/sys/arch/mvme68k/mvme68k/sys_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_machdep.c,v 1.11 2001/06/10 14:54:46 miod Exp $ */ +/* $OpenBSD: sys_machdep.c,v 1.12 2001/11/06 19:53:15 miod Exp $ */ /* * Copyright (c) 1982, 1986, 1993 @@ -47,7 +47,7 @@ #include <sys/mtio.h> #include <sys/buf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> diff --git a/sys/arch/mvme68k/mvme68k/trap.c b/sys/arch/mvme68k/mvme68k/trap.c index 84c62fd0794..c19dc60822d 100644 --- a/sys/arch/mvme68k/mvme68k/trap.c +++ b/sys/arch/mvme68k/mvme68k/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.36 2001/11/06 18:41:10 art Exp $ */ +/* $OpenBSD: trap.c,v 1.37 2001/11/06 19:53:15 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -96,9 +96,8 @@ extern struct emul emul_sunos; #endif -#include <vm/vm.h> -#include <vm/pmap.h> #include <uvm/uvm_extern.h> +#include <uvm/uvm_pmap.h> #ifdef COMPAT_HPUX #include <compat/hpux/hpux.h> diff --git a/sys/arch/mvme68k/mvme68k/vm_machdep.c b/sys/arch/mvme68k/mvme68k/vm_machdep.c index 0600b7da920..220dc50485f 100644 --- a/sys/arch/mvme68k/mvme68k/vm_machdep.c +++ b/sys/arch/mvme68k/mvme68k/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.31 2001/11/06 18:41:10 art Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.32 2001/11/06 19:53:15 miod Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -55,7 +55,6 @@ #include <machine/pte.h> #include <machine/reg.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> /* diff --git a/sys/arch/mvme88k/ddb/db_interface.c b/sys/arch/mvme88k/ddb/db_interface.c index 2a2aa651e85..bffedc2b64a 100644 --- a/sys/arch/mvme88k/ddb/db_interface.c +++ b/sys/arch/mvme88k/ddb/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.15 2001/09/23 02:52:02 miod Exp $ */ +/* $OpenBSD: db_interface.c,v 1.16 2001/11/06 19:53:15 miod Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -35,7 +35,7 @@ #include <sys/proc.h> #include <sys/reboot.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/m882xx.h> /* CMMU defs */ #include <machine/trap.h> /* current_thread() */ diff --git a/sys/arch/mvme88k/dev/if_ie.c b/sys/arch/mvme88k/dev/if_ie.c index d7be5a50e8a..724c7c67d1f 100644 --- a/sys/arch/mvme88k/dev/if_ie.c +++ b/sys/arch/mvme88k/dev/if_ie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie.c,v 1.14 2001/08/26 02:37:07 miod Exp $ */ +/* $OpenBSD: if_ie.c,v 1.15 2001/11/06 19:53:15 miod Exp $ */ /*- * Copyright (c) 1998 Steve Murphree, Jr. @@ -128,7 +128,7 @@ Mode of operation: #include <netinet/if_ether.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/autoconf.h> #include <machine/cpu.h> diff --git a/sys/arch/mvme88k/dev/if_ve.c b/sys/arch/mvme88k/dev/if_ve.c index 7581952c6e8..c075274a554 100644 --- a/sys/arch/mvme88k/dev/if_ve.c +++ b/sys/arch/mvme88k/dev/if_ve.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ve.c,v 1.10 2001/09/11 20:05:24 miod Exp $ */ +/* $OpenBSD: if_ve.c,v 1.11 2001/11/06 19:53:15 miod Exp $ */ /*- * Copyright (c) 1999 Steve Murphree, Jr. * Copyright (c) 1982, 1992, 1993 @@ -66,7 +66,7 @@ #include <net/bpfdesc.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/autoconf.h> #include <machine/cpu.h> diff --git a/sys/arch/mvme88k/dev/sram.c b/sys/arch/mvme88k/dev/sram.c index c8ffa6923bc..5e8bc3b168b 100644 --- a/sys/arch/mvme88k/dev/sram.c +++ b/sys/arch/mvme88k/dev/sram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sram.c,v 1.3 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: sram.c,v 1.4 2001/11/06 19:53:15 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -43,7 +43,7 @@ #include <machine/cpu.h> #include <machine/autoconf.h> #include <machine/mioctl.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> struct sramsoftc { struct device sc_dev; diff --git a/sys/arch/mvme88k/dev/ssh.c b/sys/arch/mvme88k/dev/ssh.c index 6c7b0406028..c89376326e6 100644 --- a/sys/arch/mvme88k/dev/ssh.c +++ b/sys/arch/mvme88k/dev/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.7 2001/09/23 02:50:25 miod Exp $ */ +/* $OpenBSD: ssh.c,v 1.8 2001/11/06 19:53:15 miod Exp $ */ /* * Copyright (c) 1994 Michael L. Hitch @@ -51,9 +51,8 @@ #include <sys/buf.h> #include <sys/malloc.h> -#include <vm/vm.h> -#include <vm/pmap.h> #include <uvm/uvm_extern.h> +#include <uvm/uvm_pmap.h> #include <machine/autoconf.h> #include <machine/mmu.h> diff --git a/sys/arch/mvme88k/dev/sshdma.c b/sys/arch/mvme88k/dev/sshdma.c index 194e1c78d29..8a6b48604ee 100644 --- a/sys/arch/mvme88k/dev/sshdma.c +++ b/sys/arch/mvme88k/dev/sshdma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshdma.c,v 1.6 2001/09/23 02:50:25 miod Exp $ */ +/* $OpenBSD: sshdma.c,v 1.7 2001/11/06 19:53:15 miod Exp $ */ /* * Copyright (c) 1996 Nivas Madhur @@ -43,9 +43,8 @@ #include <sys/kernel.h> #include <sys/device.h> -#include <vm/vm.h> -#include <vm/pmap.h> #include <uvm/uvm_extern.h> +#include <uvm/uvm_pmap.h> #include <machine/autoconf.h> #include <machine/board.h> diff --git a/sys/arch/mvme88k/dev/vme.c b/sys/arch/mvme88k/dev/vme.c index 5ecd7e92bf7..84c2cb8bf2f 100644 --- a/sys/arch/mvme88k/dev/vme.c +++ b/sys/arch/mvme88k/dev/vme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vme.c,v 1.14 2001/10/28 00:57:38 miod Exp $ */ +/* $OpenBSD: vme.c,v 1.15 2001/11/06 19:53:15 miod Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * Copyright (c) 1995 Theo de Raadt @@ -42,7 +42,7 @@ #include <sys/syslog.h> #include <sys/fcntl.h> #include <sys/device.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/autoconf.h> #include <machine/cpu.h> diff --git a/sys/arch/mvme88k/include/m88110.h b/sys/arch/mvme88k/include/m88110.h index 98403a34eeb..285c339735d 100644 --- a/sys/arch/mvme88k/include/m88110.h +++ b/sys/arch/mvme88k/include/m88110.h @@ -1,4 +1,4 @@ -/* $OpenBSD: m88110.h,v 1.6 2001/08/26 14:31:07 miod Exp $ */ +/* $OpenBSD: m88110.h,v 1.7 2001/11/06 19:53:15 miod Exp $ */ #ifndef __MACHINE_M88110_H__ #define __MACHINE_M88110_H__ @@ -9,7 +9,7 @@ #include <machine/board.h> #include <machine/cmmu.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> /* * 88110 CMMU definitions diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c index 8de0fc9f774..2032e3e0475 100644 --- a/sys/arch/mvme88k/mvme88k/machdep.c +++ b/sys/arch/mvme88k/mvme88k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.62 2001/10/28 00:59:02 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.63 2001/11/06 19:53:15 miod Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -95,7 +95,6 @@ #include <dev/cons.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <mvme88k/dev/sysconreg.h> diff --git a/sys/arch/mvme88k/mvme88k/mem.c b/sys/arch/mvme88k/mvme88k/mem.c index d3770956fb4..7ca64cfc69d 100644 --- a/sys/arch/mvme88k/mvme88k/mem.c +++ b/sys/arch/mvme88k/mvme88k/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.12 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: mem.c,v 1.13 2001/11/06 19:53:15 miod Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -53,7 +53,6 @@ #include <machine/board.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> caddr_t zeropage; diff --git a/sys/arch/mvme88k/mvme88k/pmap.c b/sys/arch/mvme88k/mvme88k/pmap.c index a6654a4c6b4..42291cd0871 100644 --- a/sys/arch/mvme88k/mvme88k/pmap.c +++ b/sys/arch/mvme88k/mvme88k/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.41 2001/09/19 20:50:57 mickey Exp $ */ +/* $OpenBSD: pmap.c,v 1.42 2001/11/06 19:53:15 miod Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * All rights reserved. @@ -56,7 +56,6 @@ #include <sys/msgbuf.h> #include <sys/user.h> -#include <vm/vm.h> #include <uvm/uvm.h> #include <machine/asm_macro.h> diff --git a/sys/arch/mvme88k/mvme88k/pmap_table.c b/sys/arch/mvme88k/mvme88k/pmap_table.c index 23c903030b2..1a1c79f1c03 100644 --- a/sys/arch/mvme88k/mvme88k/pmap_table.c +++ b/sys/arch/mvme88k/mvme88k/pmap_table.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_table.c,v 1.8 2001/09/11 20:05:24 miod Exp $ */ +/* $OpenBSD: pmap_table.c,v 1.9 2001/11/06 19:53:15 miod Exp $ */ /* * Mach Operating System @@ -32,7 +32,7 @@ #include <machine/board.h> #include <sys/param.h> #include <machine/m882xx.h> /* CMMU stuff */ -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/pmap_table.h> /* pmap_table.h*/ #define R VM_PROT_READ diff --git a/sys/arch/mvme88k/mvme88k/trap.c b/sys/arch/mvme88k/mvme88k/trap.c index 450a666795f..afb48847df2 100644 --- a/sys/arch/mvme88k/mvme88k/trap.c +++ b/sys/arch/mvme88k/mvme88k/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.23 2001/09/19 20:50:57 mickey Exp $ */ +/* $OpenBSD: trap.c,v 1.24 2001/11/06 19:53:15 miod Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -53,8 +53,6 @@ #include <sys/systm.h> #include <sys/ktrace.h> -#include <vm/vm.h> - #include <uvm/uvm_extern.h> #include <machine/asm_macro.h> /* enable/disable interrupts */ diff --git a/sys/arch/mvme88k/mvme88k/vm_machdep.c b/sys/arch/mvme88k/mvme88k/vm_machdep.c index 00643a78c41..233cdec12ee 100644 --- a/sys/arch/mvme88k/mvme88k/vm_machdep.c +++ b/sys/arch/mvme88k/mvme88k/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.36 2001/11/06 18:41:10 art Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.37 2001/11/06 19:53:15 miod Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. @@ -56,8 +56,6 @@ #include <sys/vnode.h> #include <sys/extent.h> -#include <vm/vm.h> - #include <uvm/uvm_extern.h> #include <machine/cmmu.h> diff --git a/sys/arch/mvmeppc/ddb/db_memrw.c b/sys/arch/mvmeppc/ddb/db_memrw.c index 57286301d8f..62f7d37cb10 100644 --- a/sys/arch/mvmeppc/ddb/db_memrw.c +++ b/sys/arch/mvmeppc/ddb/db_memrw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_memrw.c,v 1.1 2001/06/26 21:57:39 smurph Exp $ */ +/* $OpenBSD: db_memrw.c,v 1.2 2001/11/06 19:53:15 miod Exp $ */ /* $NetBSD: db_memrw.c,v 1.1 1996/02/22 23:23:35 gwr Exp $ */ /* @@ -41,7 +41,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/mvmeppc/dev/mem.c b/sys/arch/mvmeppc/dev/mem.c index 60f11f0c53e..08402622c05 100644 --- a/sys/arch/mvmeppc/dev/mem.c +++ b/sys/arch/mvmeppc/dev/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.3 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: mem.c,v 1.4 2001/11/06 19:53:15 miod Exp $ */ /* $NetBSD: mem.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */ /* @@ -52,7 +52,7 @@ #include <sys/uio.h> #include <sys/malloc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> /*ARGSUSED*/ int diff --git a/sys/arch/mvmeppc/dev/openpic.c b/sys/arch/mvmeppc/dev/openpic.c index 936b18215cd..b4597a53ff6 100644 --- a/sys/arch/mvmeppc/dev/openpic.c +++ b/sys/arch/mvmeppc/dev/openpic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: openpic.c,v 1.4 2001/09/11 20:05:24 miod Exp $ */ +/* $OpenBSD: openpic.c,v 1.5 2001/11/06 19:53:15 miod Exp $ */ /*- * Copyright (c) 1995 Per Fogelstrom @@ -50,7 +50,6 @@ #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/systm.h> -#include <vm/vm.h> #include <uvm/uvm.h> #include <machine/autoconf.h> diff --git a/sys/arch/mvmeppc/dev/raven.c b/sys/arch/mvmeppc/dev/raven.c index f198db8e83c..d6d16d81887 100644 --- a/sys/arch/mvmeppc/dev/raven.c +++ b/sys/arch/mvmeppc/dev/raven.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raven.c,v 1.1 2001/06/26 21:57:41 smurph Exp $ */ +/* $OpenBSD: raven.c,v 1.2 2001/11/06 19:53:15 miod Exp $ */ /* * Copyright (c) 2001 Steve Murphree, Jr. @@ -42,7 +42,7 @@ #include <sys/malloc.h> #include <sys/device.h> #include <sys/proc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/autoconf.h> diff --git a/sys/arch/mvmeppc/isa/isa_machdep.c b/sys/arch/mvmeppc/isa/isa_machdep.c index b3c8e52bbaf..7f42c67857b 100644 --- a/sys/arch/mvmeppc/isa/isa_machdep.c +++ b/sys/arch/mvmeppc/isa/isa_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.c,v 1.2 2001/07/06 05:14:30 smurph Exp $ */ +/* $OpenBSD: isa_machdep.c,v 1.3 2001/11/06 19:53:15 miod Exp $ */ /* $NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $ */ #define ISA_DMA_STATS @@ -124,7 +124,7 @@ #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/mvmeppc/mvmeppc/bus_dma.c b/sys/arch/mvmeppc/mvmeppc/bus_dma.c index eef88567b78..6f38316459c 100644 --- a/sys/arch/mvmeppc/mvmeppc/bus_dma.c +++ b/sys/arch/mvmeppc/mvmeppc/bus_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_dma.c,v 1.6 2001/11/05 17:25:58 art Exp $ */ +/* $OpenBSD: bus_dma.c,v 1.7 2001/11/06 19:53:15 miod Exp $ */ /* $NetBSD: bus_dma.c,v 1.2 2001/06/10 02:31:25 briggs Exp $ */ /*- @@ -51,7 +51,6 @@ #include <sys/mbuf.h> #include <sys/mount.h> -#include <vm/vm.h> #include <uvm/uvm.h> #include <uvm/uvm_page.h> diff --git a/sys/arch/mvmeppc/mvmeppc/genassym.cf b/sys/arch/mvmeppc/mvmeppc/genassym.cf index 9f649b1acf2..9d3aa02c871 100644 --- a/sys/arch/mvmeppc/mvmeppc/genassym.cf +++ b/sys/arch/mvmeppc/mvmeppc/genassym.cf @@ -1,4 +1,4 @@ -# $OpenBSD: genassym.cf,v 1.3 2001/09/16 14:28:04 miod Exp $ +# $OpenBSD: genassym.cf,v 1.4 2001/11/06 19:53:15 miod Exp $ # # Copyright (c) 1982, 1990 The Regents of the University of California. # All rights reserved. @@ -37,7 +37,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/mvmeppc/mvmeppc/machdep.c b/sys/arch/mvmeppc/mvmeppc/machdep.c index 8d0fc44de01..6c96354353f 100644 --- a/sys/arch/mvmeppc/mvmeppc/machdep.c +++ b/sys/arch/mvmeppc/mvmeppc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.10 2001/09/19 20:50:57 mickey Exp $ */ +/* $OpenBSD: machdep.c,v 1.11 2001/11/06 19:53:15 miod Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -51,7 +51,6 @@ #include <sys/systm.h> #include <sys/user.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #ifdef SYSVSHM diff --git a/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c b/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c index 87b6265dbe4..6ebc0816507 100644 --- a/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c +++ b/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ppc1_machdep.c,v 1.2 2001/09/11 20:05:24 miod Exp $ */ +/* $OpenBSD: ppc1_machdep.c,v 1.3 2001/11/06 19:53:15 miod Exp $ */ /* $NetBSD: ofw_machdep.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */ /* @@ -43,7 +43,7 @@ #include <sys/stat.h> #include <sys/systm.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/powerpc.h> #include <machine/autoconf.h> diff --git a/sys/arch/mvmeppc/pci/mpcpcibr.c b/sys/arch/mvmeppc/pci/mpcpcibr.c index 98df356420e..63bbb46a26c 100644 --- a/sys/arch/mvmeppc/pci/mpcpcibr.c +++ b/sys/arch/mvmeppc/pci/mpcpcibr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpcpcibr.c,v 1.5 2001/09/21 02:11:58 miod Exp $ */ +/* $OpenBSD: mpcpcibr.c,v 1.6 2001/11/06 19:53:15 miod Exp $ */ /* * Copyright (c) 2001 Steve Murphree, Jr. @@ -43,7 +43,7 @@ #include <sys/malloc.h> #include <sys/device.h> #include <sys/proc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/autoconf.h> #include <machine/bat.h> diff --git a/sys/arch/mvmeppc/pci/raven.c b/sys/arch/mvmeppc/pci/raven.c index bfd52589686..5df8ca8e3aa 100644 --- a/sys/arch/mvmeppc/pci/raven.c +++ b/sys/arch/mvmeppc/pci/raven.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raven.c,v 1.4 2001/09/21 02:11:58 miod Exp $ */ +/* $OpenBSD: raven.c,v 1.5 2001/11/06 19:53:15 miod Exp $ */ /* * Copyright (c) 2001 Steve Murphree, Jr. @@ -43,7 +43,7 @@ #include <sys/malloc.h> #include <sys/device.h> #include <sys/proc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/autoconf.h> #include <machine/bat.h> diff --git a/sys/arch/powerpc/powerpc/pmap.c b/sys/arch/powerpc/powerpc/pmap.c index 7733596d041..3075bc124c4 100644 --- a/sys/arch/powerpc/powerpc/pmap.c +++ b/sys/arch/powerpc/powerpc/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.46 2001/11/06 02:53:57 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.47 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: pmap.c,v 1.1 1996/09/30 16:34:52 ws Exp $ */ /* @@ -39,8 +39,6 @@ #include <sys/systm.h> #include <sys/pool.h> -#include <vm/vm.h> - #include <uvm/uvm.h> #include <machine/pcb.h> diff --git a/sys/arch/powerpc/powerpc/trap.c b/sys/arch/powerpc/powerpc/trap.c index d5778172955..60bd53fc1ef 100644 --- a/sys/arch/powerpc/powerpc/trap.c +++ b/sys/arch/powerpc/powerpc/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.34 2001/11/05 22:26:57 drahn Exp $ */ +/* $OpenBSD: trap.c,v 1.35 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: trap.c,v 1.3 1996/10/13 03:31:37 christos Exp $ */ /* @@ -49,8 +49,6 @@ #include <machine/trap.h> #include <machine/db_machdep.h> -#include <vm/vm.h> - #include <uvm/uvm_extern.h> #include <ddb/db_extern.h> diff --git a/sys/arch/powerpc/powerpc/vm_machdep.c b/sys/arch/powerpc/powerpc/vm_machdep.c index 23cdd3f2407..6d03dc5785d 100644 --- a/sys/arch/powerpc/powerpc/vm_machdep.c +++ b/sys/arch/powerpc/powerpc/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.25 2001/11/06 18:41:10 art Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.26 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: vm_machdep.c,v 1.1 1996/09/30 16:34:57 ws Exp $ */ /* @@ -39,8 +39,6 @@ #include <sys/user.h> #include <sys/vnode.h> -#include <vm/vm.h> - #include <uvm/uvm_extern.h> #include <machine/pcb.h> diff --git a/sys/arch/sparc/dev/bt_subr.c b/sys/arch/sparc/dev/bt_subr.c index 1f102fff824..9a24467081b 100644 --- a/sys/arch/sparc/dev/bt_subr.c +++ b/sys/arch/sparc/dev/bt_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bt_subr.c,v 1.5 2001/05/10 10:34:42 art Exp $ */ +/* $OpenBSD: bt_subr.c,v 1.6 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: bt_subr.c,v 1.5 1996/03/14 19:44:32 christos Exp $ */ /* @@ -50,7 +50,7 @@ #include <sys/buf.h> #include <sys/errno.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/fbio.h> diff --git a/sys/arch/sparc/dev/bwtwo.c b/sys/arch/sparc/dev/bwtwo.c index da88fe0fdbc..714b223c67e 100644 --- a/sys/arch/sparc/dev/bwtwo.c +++ b/sys/arch/sparc/dev/bwtwo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bwtwo.c,v 1.18 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: bwtwo.c,v 1.19 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: bwtwo.c,v 1.33 1997/05/24 20:16:02 pk Exp $ */ /* @@ -64,7 +64,7 @@ #include <sys/tty.h> #include <sys/conf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/fbio.h> #include <machine/autoconf.h> diff --git a/sys/arch/sparc/dev/cgeight.c b/sys/arch/sparc/dev/cgeight.c index b3991667997..8844b096c52 100644 --- a/sys/arch/sparc/dev/cgeight.c +++ b/sys/arch/sparc/dev/cgeight.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgeight.c,v 1.11 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: cgeight.c,v 1.12 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: cgeight.c,v 1.13 1997/05/24 20:16:04 pk Exp $ */ /* @@ -65,7 +65,7 @@ #include <sys/tty.h> #include <sys/conf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/fbio.h> #include <machine/autoconf.h> diff --git a/sys/arch/sparc/dev/cgfour.c b/sys/arch/sparc/dev/cgfour.c index 995bcfeefc6..1ccc6e452a6 100644 --- a/sys/arch/sparc/dev/cgfour.c +++ b/sys/arch/sparc/dev/cgfour.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgfour.c,v 1.11 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: cgfour.c,v 1.12 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: cgfour.c,v 1.13 1997/05/24 20:16:06 pk Exp $ */ /* @@ -69,7 +69,7 @@ #include <sys/tty.h> #include <sys/conf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/fbio.h> #include <machine/autoconf.h> diff --git a/sys/arch/sparc/dev/cgfourteen.c b/sys/arch/sparc/dev/cgfourteen.c index 0c3422d65af..43d35fb7189 100644 --- a/sys/arch/sparc/dev/cgfourteen.c +++ b/sys/arch/sparc/dev/cgfourteen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgfourteen.c,v 1.7 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: cgfourteen.c,v 1.8 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: cgfourteen.c,v 1.7 1997/05/24 20:16:08 pk Exp $ */ /* @@ -88,7 +88,7 @@ #include <sys/tty.h> #include <sys/conf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/fbio.h> #include <machine/autoconf.h> diff --git a/sys/arch/sparc/dev/cgsix.c b/sys/arch/sparc/dev/cgsix.c index 3dc5a1ef021..3f0fc8160b5 100644 --- a/sys/arch/sparc/dev/cgsix.c +++ b/sys/arch/sparc/dev/cgsix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgsix.c,v 1.16 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: cgsix.c,v 1.17 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: cgsix.c,v 1.33 1997/08/07 19:12:30 pk Exp $ */ /* @@ -69,7 +69,7 @@ #include <sys/syslog.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/autoconf.h> #include <machine/pmap.h> diff --git a/sys/arch/sparc/dev/cgthree.c b/sys/arch/sparc/dev/cgthree.c index 3f0a542ecfa..8bdb669de4f 100644 --- a/sys/arch/sparc/dev/cgthree.c +++ b/sys/arch/sparc/dev/cgthree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgthree.c,v 1.11 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: cgthree.c,v 1.12 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: cgthree.c,v 1.33 1997/05/24 20:16:11 pk Exp $ */ /* @@ -63,7 +63,7 @@ #include <sys/tty.h> #include <sys/conf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/fbio.h> #include <machine/autoconf.h> diff --git a/sys/arch/sparc/dev/cgtwo.c b/sys/arch/sparc/dev/cgtwo.c index e31704f793d..bbdbdc8ba49 100644 --- a/sys/arch/sparc/dev/cgtwo.c +++ b/sys/arch/sparc/dev/cgtwo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgtwo.c,v 1.17 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: cgtwo.c,v 1.18 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: cgtwo.c,v 1.22 1997/05/24 20:16:12 pk Exp $ */ /* @@ -63,7 +63,7 @@ #include <sys/tty.h> #include <sys/conf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/fbio.h> #include <machine/autoconf.h> diff --git a/sys/arch/sparc/dev/fga.c b/sys/arch/sparc/dev/fga.c index 4d5cecab670..b9342d76021 100644 --- a/sys/arch/sparc/dev/fga.c +++ b/sys/arch/sparc/dev/fga.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fga.c,v 1.4 2000/03/22 04:33:44 jason Exp $ */ +/* $OpenBSD: fga.c,v 1.5 2001/11/06 19:53:16 miod Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -48,7 +48,7 @@ #include <sys/syslog.h> #include <sys/device.h> #include <sys/malloc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/pmap.h> #include <machine/autoconf.h> diff --git a/sys/arch/sparc/dev/if_ie.c b/sys/arch/sparc/dev/if_ie.c index 9160e4136f3..e059db4b290 100644 --- a/sys/arch/sparc/dev/if_ie.c +++ b/sys/arch/sparc/dev/if_ie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie.c,v 1.18 2001/07/25 13:25:33 art Exp $ */ +/* $OpenBSD: if_ie.c,v 1.19 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: if_ie.c,v 1.33 1997/07/29 17:55:38 fair Exp $ */ /*- @@ -135,8 +135,7 @@ Mode of operation: #include <netns/ns_if.h> #endif -#include <vm/vm.h> - +#include <uvm/uvm_extern.h> #include <uvm/uvm_map.h> /* diff --git a/sys/arch/sparc/dev/obio.c b/sys/arch/sparc/dev/obio.c index 5f3f9afe4de..ee804c06d78 100644 --- a/sys/arch/sparc/dev/obio.c +++ b/sys/arch/sparc/dev/obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: obio.c,v 1.8 1998/10/14 02:23:45 deraadt Exp $ */ +/* $OpenBSD: obio.c,v 1.9 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: obio.c,v 1.37 1997/07/29 09:58:11 fair Exp $ */ /* @@ -42,7 +42,7 @@ #include <sys/syslog.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/autoconf.h> #include <machine/pmap.h> diff --git a/sys/arch/sparc/dev/p9100.c b/sys/arch/sparc/dev/p9100.c index 737bb41ece0..0e1bf109e7a 100644 --- a/sys/arch/sparc/dev/p9100.c +++ b/sys/arch/sparc/dev/p9100.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p9100.c,v 1.5 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: p9100.c,v 1.6 2001/11/06 19:53:16 miod Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -48,7 +48,7 @@ #include <sys/tty.h> #include <sys/conf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/fbio.h> #include <machine/autoconf.h> diff --git a/sys/arch/sparc/dev/pfour.c b/sys/arch/sparc/dev/pfour.c index c903754515a..50f53484c3e 100644 --- a/sys/arch/sparc/dev/pfour.c +++ b/sys/arch/sparc/dev/pfour.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfour.c,v 1.6 1997/08/08 08:25:20 downsj Exp $ */ +/* $OpenBSD: pfour.c,v 1.7 2001/11/06 19:53:16 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -39,7 +39,7 @@ #include <sys/syslog.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/autoconf.h> #include <machine/pmap.h> diff --git a/sys/arch/sparc/dev/sbus.c b/sys/arch/sparc/dev/sbus.c index a52f40da98f..5bb1d283a7a 100644 --- a/sys/arch/sparc/dev/sbus.c +++ b/sys/arch/sparc/dev/sbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbus.c,v 1.8 1999/04/18 03:24:25 jason Exp $ */ +/* $OpenBSD: sbus.c,v 1.9 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: sbus.c,v 1.17 1997/06/01 22:10:39 pk Exp $ */ /* @@ -53,7 +53,7 @@ #include <sys/malloc.h> #include <sys/systm.h> #include <sys/device.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/autoconf.h> diff --git a/sys/arch/sparc/dev/tcx.c b/sys/arch/sparc/dev/tcx.c index 97da6f676a2..36ff835dd2a 100644 --- a/sys/arch/sparc/dev/tcx.c +++ b/sys/arch/sparc/dev/tcx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcx.c,v 1.4 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: tcx.c,v 1.5 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: tcx.c,v 1.8 1997/07/29 09:58:14 fair Exp $ */ /* @@ -61,7 +61,7 @@ #include <sys/syslog.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/autoconf.h> #include <machine/pmap.h> diff --git a/sys/arch/sparc/dev/xd.c b/sys/arch/sparc/dev/xd.c index dd111900bd0..4d2e3d5e3d5 100644 --- a/sys/arch/sparc/dev/xd.c +++ b/sys/arch/sparc/dev/xd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xd.c,v 1.19 2001/09/11 20:05:24 miod Exp $ */ +/* $OpenBSD: xd.c,v 1.20 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: xd.c,v 1.37 1997/07/29 09:58:16 fair Exp $ */ /* @@ -76,7 +76,7 @@ #include <sys/conf.h> #include <sys/timeout.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/autoconf.h> #include <machine/sun_disklabel.h> diff --git a/sys/arch/sparc/dev/xy.c b/sys/arch/sparc/dev/xy.c index f22a9e1e3d3..b9278ca6231 100644 --- a/sys/arch/sparc/dev/xy.c +++ b/sys/arch/sparc/dev/xy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xy.c,v 1.16 2001/09/11 20:05:24 miod Exp $ */ +/* $OpenBSD: xy.c,v 1.17 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: xy.c,v 1.26 1997/07/19 21:43:56 pk Exp $ */ /* @@ -76,7 +76,7 @@ #include <sys/conf.h> #include <sys/timeout.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/autoconf.h> #include <machine/sun_disklabel.h> diff --git a/sys/arch/sparc/include/db_machdep.h b/sys/arch/sparc/include/db_machdep.h index 3b59a39846c..93d6161e098 100644 --- a/sys/arch/sparc/include/db_machdep.h +++ b/sys/arch/sparc/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.6 1999/07/09 21:33:37 art Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.7 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: db_machdep.h,v 1.10 1997/08/31 21:23:40 pk Exp $ */ /* @@ -35,7 +35,7 @@ */ -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/frame.h> #include <machine/psl.h> #include <machine/trap.h> diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c index 5674c40eaa9..4067ce05e8a 100644 --- a/sys/arch/sparc/sparc/autoconf.c +++ b/sys/arch/sparc/sparc/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.41 2001/09/19 21:32:19 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.42 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: autoconf.c,v 1.73 1997/07/29 09:41:53 fair Exp $ */ /* @@ -68,7 +68,7 @@ #include <dev/cons.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/autoconf.h> #include <machine/bsd_openprom.h> diff --git a/sys/arch/sparc/sparc/clock.c b/sys/arch/sparc/sparc/clock.c index e84b775060e..68a5bdc0bcd 100644 --- a/sys/arch/sparc/sparc/clock.c +++ b/sys/arch/sparc/sparc/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.14 2001/05/16 12:49:48 ho Exp $ */ +/* $OpenBSD: clock.c,v 1.15 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: clock.c,v 1.52 1997/05/24 20:16:05 pk Exp $ */ /* @@ -71,7 +71,7 @@ #include <sys/gmon.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/autoconf.h> #include <machine/eeprom.h> diff --git a/sys/arch/sparc/sparc/cpu.c b/sys/arch/sparc/sparc/cpu.c index 4f7c4cdadf5..39cc7540799 100644 --- a/sys/arch/sparc/sparc/cpu.c +++ b/sys/arch/sparc/sparc/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.32 2000/11/22 16:01:37 art Exp $ */ +/* $OpenBSD: cpu.c,v 1.33 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: cpu.c,v 1.56 1997/09/15 20:52:36 pk Exp $ */ /* @@ -56,7 +56,7 @@ #include <sys/systm.h> #include <sys/device.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/autoconf.h> #include <machine/cpu.h> diff --git a/sys/arch/sparc/sparc/db_interface.c b/sys/arch/sparc/sparc/db_interface.c index 85ee7ce58f4..378063f2434 100644 --- a/sys/arch/sparc/sparc/db_interface.c +++ b/sys/arch/sparc/sparc/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.8 2000/01/01 19:44:24 deraadt Exp $ */ +/* $OpenBSD: db_interface.c,v 1.9 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: db_interface.c,v 1.18 1997/09/01 00:16:31 pk Exp $ */ /* @@ -37,7 +37,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/sparc/sparc/intr.c b/sys/arch/sparc/sparc/intr.c index 91479a2ddf5..5da80cea168 100644 --- a/sys/arch/sparc/sparc/intr.c +++ b/sys/arch/sparc/sparc/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.16 2001/07/04 08:43:29 niklas Exp $ */ +/* $OpenBSD: intr.c,v 1.17 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: intr.c,v 1.20 1997/07/29 09:42:03 fair Exp $ */ /* @@ -50,7 +50,7 @@ #include <sys/kernel.h> #include <sys/socket.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <dev/cons.h> diff --git a/sys/arch/sparc/sparc/iommu.c b/sys/arch/sparc/sparc/iommu.c index 98ed227357b..72a7c9de09f 100644 --- a/sys/arch/sparc/sparc/iommu.c +++ b/sys/arch/sparc/sparc/iommu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iommu.c,v 1.10 2001/09/19 20:50:57 mickey Exp $ */ +/* $OpenBSD: iommu.c,v 1.11 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: iommu.c,v 1.13 1997/07/29 09:42:04 fair Exp $ */ /* @@ -41,7 +41,6 @@ #include <sys/systm.h> #include <sys/device.h> -#include <vm/vm.h> #include <uvm/uvm.h> #include <machine/pmap.h> diff --git a/sys/arch/sparc/sparc/kgdb_machdep.c b/sys/arch/sparc/sparc/kgdb_machdep.c index 616dece54dc..c331beb4c73 100644 --- a/sys/arch/sparc/sparc/kgdb_machdep.c +++ b/sys/arch/sparc/sparc/kgdb_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kgdb_machdep.c,v 1.3 2001/07/04 08:43:29 niklas Exp $ */ +/* $OpenBSD: kgdb_machdep.c,v 1.4 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: kgdb_machdep.c,v 1.1 1997/08/31 21:22:45 pk Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -94,7 +94,7 @@ #include <sys/buf.h> #include <sys/kgdb.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/ctlreg.h> #include <machine/psl.h> diff --git a/sys/arch/sparc/sparc/mem.c b/sys/arch/sparc/sparc/mem.c index a614e4b2a9e..960cae0d1da 100644 --- a/sys/arch/sparc/sparc/mem.c +++ b/sys/arch/sparc/sparc/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.18 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: mem.c,v 1.19 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: mem.c,v 1.13 1996/03/30 21:12:16 christos Exp $ */ /* @@ -57,7 +57,6 @@ #include <machine/eeprom.h> #include <machine/conf.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> extern vaddr_t prom_vstart; diff --git a/sys/arch/sparc/sparc/pmap.c b/sys/arch/sparc/sparc/pmap.c index 6f01fa66b3a..89884093911 100644 --- a/sys/arch/sparc/sparc/pmap.c +++ b/sys/arch/sparc/sparc/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.91 2001/09/19 20:50:57 mickey Exp $ */ +/* $OpenBSD: pmap.c,v 1.92 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: pmap.c,v 1.118 1998/05/19 19:00:18 thorpej Exp $ */ /* @@ -68,8 +68,6 @@ #include <sys/kcore.h> #include <sys/lock.h> -#include <vm/vm.h> - #include <uvm/uvm.h> #include <sys/pool.h> diff --git a/sys/arch/sparc/sparc/trap.c b/sys/arch/sparc/sparc/trap.c index 39ccfa3a0a2..62f795650de 100644 --- a/sys/arch/sparc/sparc/trap.c +++ b/sys/arch/sparc/sparc/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.32 2001/09/19 20:50:57 mickey Exp $ */ +/* $OpenBSD: trap.c,v 1.33 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: trap.c,v 1.58 1997/09/12 08:55:01 pk Exp $ */ /* @@ -65,7 +65,6 @@ #include <sys/ktrace.h> #endif -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <sparc/sparc/asm.h> diff --git a/sys/arch/sparc/sparc/vm_machdep.c b/sys/arch/sparc/sparc/vm_machdep.c index 9c2f4c238d9..ba89e8adf20 100644 --- a/sys/arch/sparc/sparc/vm_machdep.c +++ b/sys/arch/sparc/sparc/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.33 2001/11/06 18:41:10 art Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.34 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: vm_machdep.c,v 1.30 1997/03/10 23:55:40 pk Exp $ */ /* @@ -62,7 +62,6 @@ #include <sys/map.h> #include <sys/extent.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <machine/cpu.h> diff --git a/sys/arch/sparc64/dev/iommu.c b/sys/arch/sparc64/dev/iommu.c index a495ffbd935..9fe244ca7d8 100644 --- a/sys/arch/sparc64/dev/iommu.c +++ b/sys/arch/sparc64/dev/iommu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iommu.c,v 1.5 2001/10/15 03:36:16 jason Exp $ */ +/* $OpenBSD: iommu.c,v 1.6 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: iommu.c,v 1.42 2001/10/07 20:30:40 eeh Exp $ */ /* @@ -119,7 +119,6 @@ #include <sys/systm.h> #include <sys/device.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <machine/bus.h> diff --git a/sys/arch/sparc64/include/db_machdep.h b/sys/arch/sparc64/include/db_machdep.h index d1b8645db89..6bbbf6af44d 100644 --- a/sys/arch/sparc64/include/db_machdep.h +++ b/sys/arch/sparc64/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.4 2001/08/22 05:08:11 jason Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.5 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: db_machdep.h,v 1.12 2001/07/07 15:16:13 eeh Exp $ */ /* @@ -34,7 +34,6 @@ * Machine-dependent defines for new kernel debugger. */ -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <machine/frame.h> diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c index 0603e75fb6f..b20c8521673 100644 --- a/sys/arch/sparc64/sparc64/autoconf.c +++ b/sys/arch/sparc64/sparc64/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.13 2001/09/28 22:20:48 jason Exp $ */ +/* $OpenBSD: autoconf.c,v 1.14 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: autoconf.c,v 1.51 2001/07/24 19:32:11 eeh Exp $ */ /* @@ -67,7 +67,6 @@ #include <dev/cons.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <machine/bus.h> diff --git a/sys/arch/sparc64/sparc64/clock.c b/sys/arch/sparc64/sparc64/clock.c index 8bc449cb57b..b6e98577f2d 100644 --- a/sys/arch/sparc64/sparc64/clock.c +++ b/sys/arch/sparc64/sparc64/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.3 2001/10/02 14:57:09 jason Exp $ */ +/* $OpenBSD: clock.c,v 1.4 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: clock.c,v 1.41 2001/07/24 19:29:25 eeh Exp $ */ /* @@ -75,7 +75,6 @@ #endif #include <sys/sched.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <machine/bus.h> diff --git a/sys/arch/sparc64/sparc64/cpu.c b/sys/arch/sparc64/sparc64/cpu.c index b22339a1a4d..cae2e42a97d 100644 --- a/sys/arch/sparc64/sparc64/cpu.c +++ b/sys/arch/sparc64/sparc64/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.3 2001/09/19 20:50:57 mickey Exp $ */ +/* $OpenBSD: cpu.c,v 1.4 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: cpu.c,v 1.13 2001/05/26 21:27:15 chs Exp $ */ /* @@ -56,7 +56,6 @@ #include <sys/systm.h> #include <sys/device.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <machine/autoconf.h> diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c index ce68ae4e889..bf330f18776 100644 --- a/sys/arch/sparc64/sparc64/machdep.c +++ b/sys/arch/sparc64/sparc64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.18 2001/09/19 20:50:57 mickey Exp $ */ +/* $OpenBSD: machdep.c,v 1.19 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */ /*- @@ -104,7 +104,6 @@ #include <sys/syscallargs.h> #include <sys/exec.h> -#include <vm/vm.h> #include <uvm/uvm.h> #include <sys/sysctl.h> diff --git a/sys/arch/sparc64/sparc64/mem.c b/sys/arch/sparc64/sparc64/mem.c index 17f8ae8bf46..99f01729de4 100644 --- a/sys/arch/sparc64/sparc64/mem.c +++ b/sys/arch/sparc64/sparc64/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.4 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: mem.c,v 1.5 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: mem.c,v 1.18 2001/04/24 04:31:12 thorpej Exp $ */ /* @@ -57,7 +57,6 @@ #include <machine/conf.h> #include <machine/ctlreg.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> vaddr_t prom_vstart = 0xf000000; diff --git a/sys/arch/sparc64/sparc64/netbsd_machdep.c b/sys/arch/sparc64/sparc64/netbsd_machdep.c index 5dcf8adfa42..0a3bcd9a6a6 100644 --- a/sys/arch/sparc64/sparc64/netbsd_machdep.c +++ b/sys/arch/sparc64/sparc64/netbsd_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: netbsd_machdep.c,v 1.1 2001/09/06 10:45:41 art Exp $ */ +/* $OpenBSD: netbsd_machdep.c,v 1.2 2001/11/06 19:53:16 miod Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -93,7 +93,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/sparc64/sparc64/pmap.c b/sys/arch/sparc64/sparc64/pmap.c index bf0fa3fa6bf..69956edce3d 100644 --- a/sys/arch/sparc64/sparc64/pmap.c +++ b/sys/arch/sparc64/sparc64/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.6 2001/11/06 03:36:57 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.7 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: pmap.c,v 1.107 2001/08/31 16:47:41 eeh Exp $ */ #undef NO_VCACHE /* Don't forget the locked TLB in dostart */ #define HWREF @@ -39,7 +39,6 @@ #include <sys/core.h> #include <sys/kcore.h> -#include <vm/vm.h> #include <uvm/uvm.h> #include <machine/pcb.h> diff --git a/sys/arch/sparc64/sparc64/trap.c b/sys/arch/sparc64/sparc64/trap.c index 7d82334b46f..79696d2a636 100644 --- a/sys/arch/sparc64/sparc64/trap.c +++ b/sys/arch/sparc64/sparc64/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.12 2001/11/06 19:25:56 art Exp $ */ +/* $OpenBSD: trap.c,v 1.13 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: trap.c,v 1.73 2001/08/09 01:03:01 eeh Exp $ */ /* @@ -67,7 +67,6 @@ #include <sys/ktrace.h> #endif -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <machine/cpu.h> diff --git a/sys/arch/sparc64/sparc64/vm_machdep.c b/sys/arch/sparc64/sparc64/vm_machdep.c index d7450d87008..4b781e2e94d 100644 --- a/sys/arch/sparc64/sparc64/vm_machdep.c +++ b/sys/arch/sparc64/sparc64/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.4 2001/11/06 18:41:10 art Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.5 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: vm_machdep.c,v 1.38 2001/06/30 00:02:20 eeh Exp $ */ /* @@ -60,7 +60,6 @@ #include <sys/vnode.h> #include <sys/signalvar.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <machine/cpu.h> diff --git a/sys/arch/sun3/dev/bw2.c b/sys/arch/sun3/dev/bw2.c index d0364f61bd2..ad8aed93ec3 100644 --- a/sys/arch/sun3/dev/bw2.c +++ b/sys/arch/sun3/dev/bw2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bw2.c,v 1.9 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: bw2.c,v 1.10 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: bw2.c,v 1.8 1996/10/13 03:47:25 christos Exp $ */ /* @@ -60,7 +60,7 @@ #include <sys/tty.h> #include <sys/conf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/conf.h> #include <machine/cpu.h> diff --git a/sys/arch/sun3/dev/cg2.c b/sys/arch/sun3/dev/cg2.c index 12c7bf9ee1a..53411377c73 100644 --- a/sys/arch/sun3/dev/cg2.c +++ b/sys/arch/sun3/dev/cg2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cg2.c,v 1.8 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: cg2.c,v 1.9 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: cg2.c,v 1.7 1996/10/13 03:47:26 christos Exp $ */ /* @@ -62,7 +62,7 @@ #include <sys/tty.h> #include <sys/conf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/conf.h> #include <machine/fbio.h> diff --git a/sys/arch/sun3/dev/cg4.c b/sys/arch/sun3/dev/cg4.c index ac1ba39ea96..c6115e12381 100644 --- a/sys/arch/sun3/dev/cg4.c +++ b/sys/arch/sun3/dev/cg4.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cg4.c,v 1.9 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: cg4.c,v 1.10 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: cg4.c,v 1.11 1996/10/29 19:54:19 gwr Exp $ */ /* @@ -68,7 +68,7 @@ #include <sys/tty.h> #include <sys/conf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/conf.h> #include <machine/cpu.h> diff --git a/sys/arch/sun3/dev/if_ie.c b/sys/arch/sun3/dev/if_ie.c index 05695c65edb..8c5d88c3b92 100644 --- a/sys/arch/sun3/dev/if_ie.c +++ b/sys/arch/sun3/dev/if_ie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie.c,v 1.14 2001/08/08 21:01:13 miod Exp $ */ +/* $OpenBSD: if_ie.c,v 1.15 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: if_ie.c,v 1.15 1996/10/30 00:24:33 gwr Exp $ */ /*- @@ -134,7 +134,7 @@ #include <netns/ns_if.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> /* * ugly byte-order hack for SUNs diff --git a/sys/arch/sun3/dev/xd.c b/sys/arch/sun3/dev/xd.c index e84c3abf773..bb14ceb4b71 100644 --- a/sys/arch/sun3/dev/xd.c +++ b/sys/arch/sun3/dev/xd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xd.c,v 1.14 2001/09/11 20:05:24 miod Exp $ */ +/* $OpenBSD: xd.c,v 1.15 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: xd.c,v 1.10 1996/10/13 03:47:39 christos Exp $ */ /* @@ -74,7 +74,7 @@ #include <sys/disk.h> #include <sys/syslog.h> #include <sys/dkbad.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/autoconf.h> #include <machine/sun_disklabel.h> diff --git a/sys/arch/sun3/dev/xy.c b/sys/arch/sun3/dev/xy.c index c02a25f0dbc..50e73f1a45d 100644 --- a/sys/arch/sun3/dev/xy.c +++ b/sys/arch/sun3/dev/xy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xy.c,v 1.14 2001/09/11 20:05:24 miod Exp $ */ +/* $OpenBSD: xy.c,v 1.15 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: xy.c,v 1.11 1996/10/13 03:47:40 christos Exp $ */ /* @@ -74,7 +74,7 @@ #include <sys/disk.h> #include <sys/syslog.h> #include <sys/dkbad.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/autoconf.h> #include <machine/sun_disklabel.h> diff --git a/sys/arch/sun3/sun3/autoconf.c b/sys/arch/sun3/sun3/autoconf.c index 85ecc8cfe8d..8bb9ca6f98e 100644 --- a/sys/arch/sun3/sun3/autoconf.c +++ b/sys/arch/sun3/sun3/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.16 2001/09/19 20:50:57 mickey Exp $ */ +/* $OpenBSD: autoconf.c,v 1.17 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: autoconf.c,v 1.37 1996/11/20 18:57:22 gwr Exp $ */ /*- @@ -59,7 +59,6 @@ #include <scsi/scsi_all.h> #include <scsi/scsiconf.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <machine/autoconf.h> diff --git a/sys/arch/sun3/sun3/db_machdep.c b/sys/arch/sun3/sun3/db_machdep.c index 9fe68433b40..78f481d5815 100644 --- a/sys/arch/sun3/sun3/db_machdep.c +++ b/sys/arch/sun3/sun3/db_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.c,v 1.11 2001/05/30 20:35:57 miod Exp $ */ +/* $OpenBSD: db_machdep.c,v 1.12 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: db_machdep.c,v 1.8 1996/11/20 18:57:27 gwr Exp $ */ /*- @@ -45,7 +45,7 @@ #include <sys/systm.h> #include <sys/proc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/control.h> #include <machine/db_machdep.h> diff --git a/sys/arch/sun3/sun3/db_memrw.c b/sys/arch/sun3/sun3/db_memrw.c index 684947d043d..c1b267265fc 100644 --- a/sys/arch/sun3/sun3/db_memrw.c +++ b/sys/arch/sun3/sun3/db_memrw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_memrw.c,v 1.8 2001/06/11 01:30:13 miod Exp $ */ +/* $OpenBSD: db_memrw.c,v 1.9 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: db_memrw.c,v 1.13 1996/11/20 18:57:28 gwr Exp $ */ /*- @@ -57,7 +57,7 @@ #include <sys/systm.h> #include <sys/proc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/control.h> #include <machine/pte.h> diff --git a/sys/arch/sun3/sun3/dvma.c b/sys/arch/sun3/sun3/dvma.c index 285e3cc9dd1..811727aa3af 100644 --- a/sys/arch/sun3/sun3/dvma.c +++ b/sys/arch/sun3/sun3/dvma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dvma.c,v 1.13 2001/09/19 20:50:57 mickey Exp $ */ +/* $OpenBSD: dvma.c,v 1.14 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: dvma.c,v 1.5 1996/11/20 18:57:29 gwr Exp $ */ /*- @@ -49,8 +49,6 @@ #include <sys/core.h> #include <sys/exec.h> -#include <vm/vm.h> - #include <uvm/uvm.h> #include <machine/autoconf.h> diff --git a/sys/arch/sun3/sun3/genassym.cf b/sys/arch/sun3/sun3/genassym.cf index ac1bd5ebc78..9a733a0e656 100644 --- a/sys/arch/sun3/sun3/genassym.cf +++ b/sys/arch/sun3/sun3/genassym.cf @@ -1,4 +1,4 @@ -# $OpenBSD: genassym.cf,v 1.6 2001/09/16 14:28:04 miod Exp $ +# $OpenBSD: genassym.cf,v 1.7 2001/11/06 19:53:16 miod Exp $ # $NetBSD: genassym.c,v 1.32 1996/10/23 16:39:27 gwr Exp $ # @@ -46,7 +46,6 @@ include <sys/errno.h> include <sys/proc.h> include <sys/syscall.h> -include <vm/vm.h> include <uvm/uvm_extern.h> include <machine/control.h> diff --git a/sys/arch/sun3/sun3/intreg.c b/sys/arch/sun3/sun3/intreg.c index ceca7dd8b7f..a0e9796c11b 100644 --- a/sys/arch/sun3/sun3/intreg.c +++ b/sys/arch/sun3/sun3/intreg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intreg.c,v 1.8 2001/06/27 04:44:02 art Exp $ */ +/* $OpenBSD: intreg.c,v 1.9 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: intreg.c,v 1.5 1996/11/20 18:57:32 gwr Exp $ */ /*- @@ -55,8 +55,6 @@ #include <machine/mon.h> #include <machine/obio.h> -#include <vm/vm.h> - #include <uvm/uvm_extern.h> #include "interreg.h" diff --git a/sys/arch/sun3/sun3/isr.c b/sys/arch/sun3/sun3/isr.c index 5d37466af9b..8ed7530e513 100644 --- a/sys/arch/sun3/sun3/isr.c +++ b/sys/arch/sun3/sun3/isr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isr.c,v 1.14 2001/06/27 04:44:02 art Exp $ */ +/* $OpenBSD: isr.c,v 1.15 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: isr.c,v 1.25 1996/11/20 18:57:32 gwr Exp $ */ /*- @@ -54,8 +54,6 @@ #include <machine/mon.h> #include <machine/obio.h> -#include <vm/vm.h> - #include <uvm/uvm_extern.h> #include "vector.h" diff --git a/sys/arch/sun3/sun3/kgdb_stub.c b/sys/arch/sun3/sun3/kgdb_stub.c index 1f914d20c6c..68d000596f3 100644 --- a/sys/arch/sun3/sun3/kgdb_stub.c +++ b/sys/arch/sun3/sun3/kgdb_stub.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kgdb_stub.c,v 1.7 2001/09/20 17:02:31 mpech Exp $ */ +/* $OpenBSD: kgdb_stub.c,v 1.8 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: kgdb_stub.c,v 1.6 1996/10/23 16:30:48 gwr Exp $ */ /* @@ -52,7 +52,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/control.h> #include <machine/cpu.h> diff --git a/sys/arch/sun3/sun3/machdep.c b/sys/arch/sun3/sun3/machdep.c index 99b9dba642b..f5efed34203 100644 --- a/sys/arch/sun3/sun3/machdep.c +++ b/sys/arch/sun3/sun3/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.42 2001/09/19 20:50:57 mickey Exp $ */ +/* $OpenBSD: machdep.c,v 1.43 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: machdep.c,v 1.77 1996/10/13 03:47:51 christos Exp $ */ /* @@ -79,8 +79,6 @@ #include <sys/shm.h> #endif -#include <vm/vm.h> - #include <uvm/uvm_extern.h> #include <dev/cons.h> diff --git a/sys/arch/sun3/sun3/mem.c b/sys/arch/sun3/sun3/mem.c index 9af2a56312d..3766c46972c 100644 --- a/sys/arch/sun3/sun3/mem.c +++ b/sys/arch/sun3/sun3/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.16 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: mem.c,v 1.17 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: mem.c,v 1.19 1995/08/08 21:09:01 gwr Exp $ */ /* @@ -55,7 +55,7 @@ #include <sys/proc.h> #include <sys/uio.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/conf.h> #include <machine/cpu.h> diff --git a/sys/arch/sun3/sun3/sun3_startup.c b/sys/arch/sun3/sun3/sun3_startup.c index 9806bdf8bdb..f5335b1c66f 100644 --- a/sys/arch/sun3/sun3/sun3_startup.c +++ b/sys/arch/sun3/sun3/sun3_startup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sun3_startup.c,v 1.19 2001/09/14 09:09:45 art Exp $ */ +/* $OpenBSD: sun3_startup.c,v 1.20 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: sun3_startup.c,v 1.55 1996/11/20 18:57:38 gwr Exp $ */ /*- @@ -45,7 +45,7 @@ #include <sys/exec_aout.h> #include <sys/msgbuf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/control.h> #include <machine/cpu.h> diff --git a/sys/arch/sun3/sun3/sys_machdep.c b/sys/arch/sun3/sun3/sys_machdep.c index c3103a9ea02..67fa9fd7df4 100644 --- a/sys/arch/sun3/sun3/sys_machdep.c +++ b/sys/arch/sun3/sun3/sys_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_machdep.c,v 1.8 2000/06/23 02:14:37 mickey Exp $ */ +/* $OpenBSD: sys_machdep.c,v 1.9 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: sys_machdep.c,v 1.3 1995/10/27 15:58:23 gwr Exp $ */ /* @@ -49,7 +49,7 @@ #include <sys/buf.h> #include <sys/mount.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/syscallargs.h> diff --git a/sys/arch/sun3/sun3/trap.c b/sys/arch/sun3/sun3/trap.c index f7242c0c6a5..bf4f4c39965 100644 --- a/sys/arch/sun3/sun3/trap.c +++ b/sys/arch/sun3/sun3/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.27 2001/11/06 18:41:10 art Exp $ */ +/* $OpenBSD: trap.c,v 1.28 2001/11/06 19:53:16 miod Exp $ */ /* $NetBSD: trap.c,v 1.63-1.65ish 1997/01/16 15:41:40 gwr Exp $ */ /* @@ -58,8 +58,8 @@ #include <sys/ktrace.h> #endif -#include <vm/vm.h> -#include <vm/pmap.h> +#include <uvm/uvm_extern.h> +#include <uvm/uvm_pmap.h> #include <machine/cpu.h> #include <machine/db_machdep.h> diff --git a/sys/arch/vax/bi/kdb.c b/sys/arch/vax/bi/kdb.c index 4c99f1dd293..59fc4bc72c8 100644 --- a/sys/arch/vax/bi/kdb.c +++ b/sys/arch/vax/bi/kdb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kdb.c,v 1.4 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: kdb.c,v 1.5 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: kdb.c,v 1.5 1997/01/11 11:34:39 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -47,7 +47,7 @@ #include <sys/proc.h> #include <sys/malloc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/sid.h> #include <machine/pte.h> diff --git a/sys/arch/vax/if/if_le.c b/sys/arch/vax/if/if_le.c index fbdcf4d626d..eb70d751946 100644 --- a/sys/arch/vax/if/if_le.c +++ b/sys/arch/vax/if/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.7 2001/09/19 20:50:57 mickey Exp $ */ +/* $OpenBSD: if_le.c,v 1.8 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: if_le.c,v 1.14 1999/08/14 18:40:23 ragge Exp $ */ /*- @@ -84,7 +84,6 @@ #include <sys/device.h> #include <sys/reboot.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <net/if.h> diff --git a/sys/arch/vax/include/db_machdep.h b/sys/arch/vax/include/db_machdep.h index 9cdb4d5ecf6..de9d48ce7a4 100644 --- a/sys/arch/vax/include/db_machdep.h +++ b/sys/arch/vax/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.7 2000/04/26 03:08:41 bjc Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.8 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: db_machdep.h,v 1.6 1998/08/10 14:33:33 ragge Exp $ */ /* @@ -36,7 +36,7 @@ */ #include <sys/param.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/trap.h> #include <machine/psl.h> diff --git a/sys/arch/vax/mba/mba.c b/sys/arch/vax/mba/mba.c index ee92e0f9914..7e6a056eb0e 100644 --- a/sys/arch/vax/mba/mba.c +++ b/sys/arch/vax/mba/mba.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mba.c,v 1.7 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: mba.c,v 1.8 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: mba.c,v 1.18 2000/01/24 02:40:36 matt Exp $ */ /* * Copyright (c) 1994, 1996 Ludd, University of Lule}, Sweden. @@ -45,7 +45,7 @@ #include <sys/buf.h> #include <sys/proc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/trap.h> #include <machine/scb.h> diff --git a/sys/arch/vax/qbus/qd.c b/sys/arch/vax/qbus/qd.c index 38eaa483b17..ec0543d173b 100644 --- a/sys/arch/vax/qbus/qd.c +++ b/sys/arch/vax/qbus/qd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qd.c,v 1.1 2000/04/27 03:14:48 bjc Exp $ */ +/* $OpenBSD: qd.c,v 1.2 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: qd.c,v 1.17 2000/01/24 02:40:29 matt Exp $ */ /*- @@ -73,7 +73,7 @@ #include <sys/poll.h> #include <sys/buf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <dev/cons.h> diff --git a/sys/arch/vax/qbus/uba.c b/sys/arch/vax/qbus/uba.c index aeb6f22ac8b..79784d246c9 100644 --- a/sys/arch/vax/qbus/uba.c +++ b/sys/arch/vax/qbus/uba.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uba.c,v 1.3 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: uba.c,v 1.4 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: uba.c,v 1.52 2000/06/04 02:14:12 matt Exp $ */ /* * Copyright (c) 1996 Jonathan Stone. @@ -52,7 +52,7 @@ #include <sys/malloc.h> #include <sys/device.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/bus.h> #include <machine/scb.h> diff --git a/sys/arch/vax/uba/uba.c b/sys/arch/vax/uba/uba.c index 861dd2ef7ba..81d36cd2485 100644 --- a/sys/arch/vax/uba/uba.c +++ b/sys/arch/vax/uba/uba.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uba.c,v 1.11 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: uba.c,v 1.12 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: uba.c,v 1.43 2000/01/24 02:40:36 matt Exp $ */ /* * Copyright (c) 1996 Jonathan Stone. @@ -52,7 +52,7 @@ #include <sys/malloc.h> #include <sys/device.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/pte.h> #include <machine/cpu.h> diff --git a/sys/arch/vax/uba/uba_dma.c b/sys/arch/vax/uba/uba_dma.c index f0344dfff96..eaa15da03f1 100644 --- a/sys/arch/vax/uba/uba_dma.c +++ b/sys/arch/vax/uba/uba_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uba_dma.c,v 1.1 2000/04/27 03:14:51 bjc Exp $ */ +/* $OpenBSD: uba_dma.c,v 1.2 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: uba_dma.c,v 1.2 1999/06/20 00:59:55 ragge Exp $ */ /*- @@ -44,7 +44,7 @@ #include <sys/kernel.h> #include <sys/device.h> #include <sys/malloc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #define _VAX_BUS_DMA_PRIVATE #include <machine/bus.h> diff --git a/sys/arch/vax/vax/autoconf.c b/sys/arch/vax/vax/autoconf.c index 45db18b07c6..d231cf91a8b 100644 --- a/sys/arch/vax/vax/autoconf.c +++ b/sys/arch/vax/vax/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.14 2001/06/25 00:43:19 mickey Exp $ */ +/* $OpenBSD: autoconf.c,v 1.15 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: autoconf.c,v 1.45 1999/10/23 14:56:05 ragge Exp $ */ /* @@ -38,7 +38,7 @@ #include <sys/reboot.h> #include <sys/conf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> #include <machine/sid.h> diff --git a/sys/arch/vax/vax/bus_mem.c b/sys/arch/vax/vax/bus_mem.c index 95b908cece7..1f63fa5e9f3 100644 --- a/sys/arch/vax/vax/bus_mem.c +++ b/sys/arch/vax/vax/bus_mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_mem.c,v 1.3 2001/09/19 20:50:57 mickey Exp $ */ +/* $OpenBSD: bus_mem.c,v 1.4 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: bus_mem.c,v 1.8 2000/06/29 07:14:23 mrg Exp $ */ /* * Copyright (c) 1998 Matt Thomas @@ -39,7 +39,6 @@ #include <sys/kernel.h> #include <sys/systm.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <machine/cpu.h> diff --git a/sys/arch/vax/vax/db_machdep.c b/sys/arch/vax/vax/db_machdep.c index 0cc060a6f2e..ab4c3ddf0f9 100644 --- a/sys/arch/vax/vax/db_machdep.c +++ b/sys/arch/vax/vax/db_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.c,v 1.9 2000/10/11 06:13:40 bjc Exp $ */ +/* $OpenBSD: db_machdep.c,v 1.10 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: db_machdep.c,v 1.17 1999/06/20 00:58:23 ragge Exp $ */ /* @@ -42,7 +42,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/vax/vax/disksubr.c b/sys/arch/vax/vax/disksubr.c index 7041e07c2a5..b1ceea7e47b 100644 --- a/sys/arch/vax/vax/disksubr.c +++ b/sys/arch/vax/vax/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.14 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: disksubr.c,v 1.15 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1999/06/30 18:48:06 ragge Exp $ */ /* @@ -45,7 +45,7 @@ #include <sys/proc.h> #include <sys/user.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/macros.h> #include <machine/pte.h> diff --git a/sys/arch/vax/vax/ka410.c b/sys/arch/vax/vax/ka410.c index 187b129f998..28b26a84635 100644 --- a/sys/arch/vax/vax/ka410.c +++ b/sys/arch/vax/vax/ka410.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka410.c,v 1.7 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: ka410.c,v 1.8 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: ka410.c,v 1.21 1999/09/06 19:52:53 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -39,7 +39,7 @@ #include <sys/kernel.h> #include <sys/systm.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/pte.h> #include <machine/cpu.h> diff --git a/sys/arch/vax/vax/ka43.c b/sys/arch/vax/vax/ka43.c index 0b6674d37e1..7002144dabc 100644 --- a/sys/arch/vax/vax/ka43.c +++ b/sys/arch/vax/vax/ka43.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka43.c,v 1.6 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: ka43.c,v 1.7 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: ka43.c,v 1.19 1999/09/06 19:52:53 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -39,7 +39,7 @@ #include <sys/kernel.h> #include <sys/systm.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/pte.h> #include <machine/cpu.h> diff --git a/sys/arch/vax/vax/ka46.c b/sys/arch/vax/vax/ka46.c index 4ba6f82e14d..06b1ffcadfe 100644 --- a/sys/arch/vax/vax/ka46.c +++ b/sys/arch/vax/vax/ka46.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka46.c,v 1.4 2001/10/01 12:56:43 hugh Exp $ */ +/* $OpenBSD: ka46.c,v 1.5 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: ka46.c,v 1.12 2000/03/04 07:27:49 matt Exp $ */ /* * Copyright (c) 1998 Ludd, University of Lule}, Sweden. @@ -39,7 +39,7 @@ #include <sys/kernel.h> #include <sys/systm.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/pte.h> #include <machine/cpu.h> diff --git a/sys/arch/vax/vax/ka48.c b/sys/arch/vax/vax/ka48.c index 566dfd82407..13426dde1a5 100644 --- a/sys/arch/vax/vax/ka48.c +++ b/sys/arch/vax/vax/ka48.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka48.c,v 1.5 2001/10/01 12:57:19 hugh Exp $ */ +/* $OpenBSD: ka48.c,v 1.6 2001/11/06 19:53:17 miod Exp $ */ /* * Copyright (c) 1998 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -40,7 +40,7 @@ #include <sys/kernel.h> #include <sys/systm.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/pte.h> #include <machine/cpu.h> diff --git a/sys/arch/vax/vax/ka630.c b/sys/arch/vax/vax/ka630.c index b1c21521f11..ef575cdf3ed 100644 --- a/sys/arch/vax/vax/ka630.c +++ b/sys/arch/vax/vax/ka630.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka630.c,v 1.6 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: ka630.c,v 1.7 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: ka630.c,v 1.17 1999/09/06 19:52:52 ragge Exp $ */ /*- * Copyright (c) 1982, 1988, 1990, 1993 @@ -42,7 +42,7 @@ #include <sys/time.h> #include <sys/systm.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> #include <machine/pmap.h> diff --git a/sys/arch/vax/vax/ka650.c b/sys/arch/vax/vax/ka650.c index e8eb625dabb..78634ca82fd 100644 --- a/sys/arch/vax/vax/ka650.c +++ b/sys/arch/vax/vax/ka650.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka650.c,v 1.9 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: ka650.c,v 1.10 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: ka650.c,v 1.25 2001/04/27 15:02:37 ragge Exp $ */ /* * Copyright (c) 1988 The Regents of the University of California. @@ -47,7 +47,7 @@ #include <sys/kernel.h> #include <sys/systm.h> #include <sys/device.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/ka650.h> #include <machine/clock.h> diff --git a/sys/arch/vax/vax/ka660.c b/sys/arch/vax/vax/ka660.c index 45f2a140e46..23684998f75 100644 --- a/sys/arch/vax/vax/ka660.c +++ b/sys/arch/vax/vax/ka660.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka660.c,v 1.2 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: ka660.c,v 1.3 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: ka660.c,v 1.3 2000/06/29 07:14:27 mrg Exp $ */ /* * Copyright (c) 2000 Ludd, University of Lule}, Sweden. @@ -37,7 +37,7 @@ #include <sys/kernel.h> #include <sys/systm.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/pte.h> #include <machine/cpu.h> diff --git a/sys/arch/vax/vax/ka670.c b/sys/arch/vax/vax/ka670.c index 46ad52fedce..4a5bac7b26a 100644 --- a/sys/arch/vax/vax/ka670.c +++ b/sys/arch/vax/vax/ka670.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka670.c,v 1.2 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: ka670.c,v 1.3 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: ka670.c,v 1.4 2000/03/13 23:52:35 soren Exp $ */ /* * Copyright (c) 1999 Ludd, University of Lule}, Sweden. @@ -39,7 +39,7 @@ #include <sys/kernel.h> #include <sys/systm.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/pte.h> #include <machine/cpu.h> diff --git a/sys/arch/vax/vax/ka820.c b/sys/arch/vax/vax/ka820.c index 20b675b94d5..e692f87c126 100644 --- a/sys/arch/vax/vax/ka820.c +++ b/sys/arch/vax/vax/ka820.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka820.c,v 1.6 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: ka820.c,v 1.7 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: ka820.c,v 1.22 2000/06/04 02:19:27 matt Exp $ */ /* * Copyright (c) 1988 Regents of the University of California. @@ -49,7 +49,7 @@ #include <sys/device.h> #include <sys/systm.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/ka820.h> #include <machine/cpu.h> diff --git a/sys/arch/vax/vax/locore.c b/sys/arch/vax/vax/locore.c index fb75881d263..ecb0510a5fb 100644 --- a/sys/arch/vax/vax/locore.c +++ b/sys/arch/vax/vax/locore.c @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.c,v 1.19 2001/10/01 12:56:43 hugh Exp $ */ +/* $OpenBSD: locore.c,v 1.20 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: locore.c,v 1.43 2000/03/26 11:39:45 ragge Exp $ */ /* * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden. @@ -39,7 +39,7 @@ #include <sys/systm.h> #include <sys/user.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> #include <machine/sid.h> diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c index f188b5b1335..28742056af9 100644 --- a/sys/arch/vax/vax/machdep.c +++ b/sys/arch/vax/vax/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.41 2001/10/04 00:21:12 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.42 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $ */ /* @@ -66,12 +66,10 @@ #include <sys/mount.h> #include <sys/syscallargs.h> #include <sys/ptrace.h> -#include <vm/vm.h> #include <sys/sysctl.h> #include <dev/cons.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #ifdef SYSVMSG diff --git a/sys/arch/vax/vax/mem.c b/sys/arch/vax/vax/mem.c index 4d96ac7bb7b..b9b1dc06272 100644 --- a/sys/arch/vax/vax/mem.c +++ b/sys/arch/vax/vax/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.9 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: mem.c,v 1.10 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: mem.c,v 1.15 1999/03/24 05:51:17 mrg Exp $ */ /* @@ -56,7 +56,7 @@ #include <machine/pte.h> #include <machine/mtpr.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> extern unsigned int avail_end; caddr_t zeropage; diff --git a/sys/arch/vax/vax/sgmap.c b/sys/arch/vax/vax/sgmap.c index 1b55dec4bbe..b5909f7e39f 100644 --- a/sys/arch/vax/vax/sgmap.c +++ b/sys/arch/vax/vax/sgmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sgmap.c,v 1.5 2001/07/05 10:00:41 art Exp $ */ +/* $OpenBSD: sgmap.c,v 1.6 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: sgmap.c,v 1.8 2000/06/29 07:14:34 mrg Exp $ */ /*- @@ -44,7 +44,7 @@ #include <sys/proc.h> #include <sys/malloc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/bus.h> #include <machine/sgmap.h> diff --git a/sys/arch/vax/vax/uvax.c b/sys/arch/vax/vax/uvax.c index c8573c02779..9d6b22ebae7 100644 --- a/sys/arch/vax/vax/uvax.c +++ b/sys/arch/vax/vax/uvax.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvax.c,v 1.6 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: uvax.c,v 1.7 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: uvax.c,v 1.4 1997/02/19 10:04:27 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -41,7 +41,7 @@ #include <sys/param.h> #include <sys/types.h> #include <sys/device.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/pte.h> #include <machine/mtpr.h> diff --git a/sys/arch/vax/vax/uvaxII.c b/sys/arch/vax/vax/uvaxII.c index 91c9c4527e8..ec9246b5ca8 100644 --- a/sys/arch/vax/vax/uvaxII.c +++ b/sys/arch/vax/vax/uvaxII.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvaxII.c,v 1.8 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: uvaxII.c,v 1.9 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: uvaxII.c,v 1.10 1996/10/13 03:36:04 christos Exp $ */ /*- @@ -43,7 +43,7 @@ #include <sys/types.h> #include <sys/device.h> #include <sys/systm.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/uvaxII.h> #include <machine/pte.h> diff --git a/sys/arch/vax/vsa/if_le_vsbus.c b/sys/arch/vax/vsa/if_le_vsbus.c index 0973276c66f..82fa233db61 100644 --- a/sys/arch/vax/vsa/if_le_vsbus.c +++ b/sys/arch/vax/vsa/if_le_vsbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_vsbus.c,v 1.5 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: if_le_vsbus.c,v 1.6 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: if_le_vsbus.c,v 1.10 2000/06/29 07:14:18 mrg Exp $ */ /*- @@ -83,7 +83,7 @@ #include <sys/device.h> #include <sys/reboot.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <net/if.h> #include <net/if_media.h> diff --git a/sys/arch/vax/vsa/ncr.c b/sys/arch/vax/vsa/ncr.c index 289132a36ef..ab4e9f84728 100644 --- a/sys/arch/vax/vsa/ncr.c +++ b/sys/arch/vax/vsa/ncr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr.c,v 1.11 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: ncr.c,v 1.12 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: ncr.c,v 1.32 2000/06/25 16:00:43 ragge Exp $ */ /*- @@ -60,7 +60,7 @@ #include <sys/proc.h> #include <sys/user.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <scsi/scsi_all.h> #include <scsi/scsi_debug.h> diff --git a/sys/arch/vax/vsa/vsbus.c b/sys/arch/vax/vsa/vsbus.c index ea615e9ba68..ca3d46be943 100644 --- a/sys/arch/vax/vsa/vsbus.c +++ b/sys/arch/vax/vsa/vsbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vsbus.c,v 1.8 2001/09/19 20:50:57 mickey Exp $ */ +/* $OpenBSD: vsbus.c,v 1.9 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: vsbus.c,v 1.29 2000/06/29 07:14:37 mrg Exp $ */ /* * Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden. @@ -48,7 +48,6 @@ #include <sys/syslog.h> #include <sys/stat.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #define _VAX_BUS_DMA_PRIVATE diff --git a/sys/arch/vax/vsa/vsbus_dma.c b/sys/arch/vax/vsa/vsbus_dma.c index 3940e0e7d8a..225df0ea3a7 100644 --- a/sys/arch/vax/vsa/vsbus_dma.c +++ b/sys/arch/vax/vsa/vsbus_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vsbus_dma.c,v 1.2 2001/02/06 04:27:46 hugh Exp $ */ +/* $OpenBSD: vsbus_dma.c,v 1.3 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: vsbus_dma.c,v 1.7 2000/07/26 21:50:49 matt Exp $ */ /*- @@ -45,7 +45,7 @@ #include <sys/device.h> #include <sys/malloc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #define _VAX_BUS_DMA_PRIVATE #include <machine/bus.h> diff --git a/sys/compat/bsdos/bsdos_exec.c b/sys/compat/bsdos/bsdos_exec.c index f5a6eadae7a..04e013c0435 100644 --- a/sys/compat/bsdos/bsdos_exec.c +++ b/sys/compat/bsdos/bsdos_exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bsdos_exec.c,v 1.3 2000/06/08 22:25:24 niklas Exp $ */ +/* $OpenBSD: bsdos_exec.c,v 1.4 2001/11/06 19:53:17 miod Exp $ */ /* * Copyright (c) 1993, 1994 Christopher G. Demetriou @@ -38,7 +38,7 @@ #include <sys/vnode.h> #include <sys/exec.h> #include <sys/resourcevar.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #if 0 #include <machine/bsdos_machdep.h> diff --git a/sys/compat/common/compat_exec.c b/sys/compat/common/compat_exec.c index 0f938a21507..d22b2eace7c 100644 --- a/sys/compat/common/compat_exec.c +++ b/sys/compat/common/compat_exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: compat_exec.c,v 1.5 1999/11/26 16:44:27 art Exp $ */ +/* $OpenBSD: compat_exec.c,v 1.6 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: compat_exec.c,v 1.1 1996/05/18 15:52:21 christos Exp $ */ /* @@ -38,7 +38,7 @@ #include <sys/vnode.h> #include <sys/exec.h> #include <sys/resourcevar.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> /* * exec_aout_prep_oldzmagic(): diff --git a/sys/compat/common/compat_util.h b/sys/compat/common/compat_util.h index 2acb1bf0efa..e08ef7f8754 100644 --- a/sys/compat/common/compat_util.h +++ b/sys/compat/common/compat_util.h @@ -1,4 +1,4 @@ -/* $OpenBSD: compat_util.h,v 1.5 2001/08/12 20:33:50 mickey Exp $ */ +/* $OpenBSD: compat_util.h,v 1.6 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: compat_util.h,v 1.1 1995/06/24 20:16:05 christos Exp $ */ /* @@ -33,7 +33,7 @@ #ifndef _COMPAT_UTIL_H_ #define _COMPAT_UTIL_H_ -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/exec.h> struct emul; diff --git a/sys/compat/common/kern_exit_43.c b/sys/compat/common/kern_exit_43.c index 3559fdbc0d3..586d96584af 100644 --- a/sys/compat/common/kern_exit_43.c +++ b/sys/compat/common/kern_exit_43.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_exit_43.c,v 1.3 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: kern_exit_43.c,v 1.4 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: kern_exit_43.c,v 1.3 1995/10/07 06:26:20 mycroft Exp $ */ /* @@ -69,7 +69,7 @@ #include <machine/psl.h> #include <compat/common/compat_util.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #ifdef m68k #include <machine/frame.h> #define GETPS(rp) ((struct frame *)(rp))->f_sr diff --git a/sys/compat/common/kern_info_09.c b/sys/compat/common/kern_info_09.c index 88faa49a2fc..1c84d9e1a13 100644 --- a/sys/compat/common/kern_info_09.c +++ b/sys/compat/common/kern_info_09.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_info_09.c,v 1.7 2001/05/16 05:07:51 millert Exp $ */ +/* $OpenBSD: kern_info_09.c,v 1.8 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: kern_info_09.c,v 1.5 1996/02/21 00:10:59 cgd Exp $ */ /* @@ -43,7 +43,7 @@ #include <sys/proc.h> #include <sys/syslog.h> #include <sys/unistd.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/sysctl.h> #include <sys/mount.h> diff --git a/sys/compat/common/kern_info_43.c b/sys/compat/common/kern_info_43.c index 099c651d70c..387c78cf3d0 100644 --- a/sys/compat/common/kern_info_43.c +++ b/sys/compat/common/kern_info_43.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_info_43.c,v 1.10 2001/06/27 04:58:41 art Exp $ */ +/* $OpenBSD: kern_info_43.c,v 1.11 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: kern_info_43.c,v 1.5 1996/02/04 02:02:22 christos Exp $ */ /* @@ -52,7 +52,7 @@ #include <sys/syslog.h> #include <sys/unistd.h> #include <sys/resourcevar.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/sysctl.h> #include <sys/mount.h> diff --git a/sys/compat/common/kern_ipc_10.c b/sys/compat/common/kern_ipc_10.c index dab0cec8fdf..33ea5ac5a76 100644 --- a/sys/compat/common/kern_ipc_10.c +++ b/sys/compat/common/kern_ipc_10.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_ipc_10.c,v 1.6 2001/08/11 23:14:22 art Exp $ */ +/* $OpenBSD: kern_ipc_10.c,v 1.7 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: kern_ipc_10.c,v 1.4 1995/10/07 06:26:25 mycroft Exp $ */ /* @@ -41,7 +41,7 @@ #include <sys/mount.h> #include <sys/syscallargs.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> /* * Note that while we no longer have a COMPAT_10 kernel option, diff --git a/sys/compat/common/kern_resource_43.c b/sys/compat/common/kern_resource_43.c index 53cc1fd5d2f..0f5c77b6de9 100644 --- a/sys/compat/common/kern_resource_43.c +++ b/sys/compat/common/kern_resource_43.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_resource_43.c,v 1.2 1996/04/18 21:21:33 niklas Exp $ */ +/* $OpenBSD: kern_resource_43.c,v 1.3 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: kern_resource_43.c,v 1.4 1996/03/14 19:31:46 christos Exp $ */ /*- @@ -52,7 +52,7 @@ #include <sys/mount.h> #include <sys/syscallargs.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> /* ARGSUSED */ int diff --git a/sys/compat/common/kern_sig_43.c b/sys/compat/common/kern_sig_43.c index 2e3d78712c7..06d0ba41e88 100644 --- a/sys/compat/common/kern_sig_43.c +++ b/sys/compat/common/kern_sig_43.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sig_43.c,v 1.5 2001/05/16 05:07:51 millert Exp $ */ +/* $OpenBSD: kern_sig_43.c,v 1.6 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: kern_sig_43.c,v 1.7 1996/03/14 19:31:47 christos Exp $ */ /* @@ -65,7 +65,7 @@ #include <machine/cpu.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/user.h> /* for coredump */ int diff --git a/sys/compat/common/vfs_syscalls_43.c b/sys/compat/common/vfs_syscalls_43.c index 0edb4c3a51f..976043be90c 100644 --- a/sys/compat/common/vfs_syscalls_43.c +++ b/sys/compat/common/vfs_syscalls_43.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_syscalls_43.c,v 1.15 2001/10/26 12:03:27 art Exp $ */ +/* $OpenBSD: vfs_syscalls_43.c,v 1.16 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: vfs_syscalls_43.c,v 1.4 1996/03/14 19:31:52 christos Exp $ */ /* @@ -63,7 +63,7 @@ #include <sys/mount.h> #include <sys/syscallargs.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/pipe.h> diff --git a/sys/compat/common/vm_43.c b/sys/compat/common/vm_43.c index 150b328f046..1ac5dec6812 100644 --- a/sys/compat/common/vm_43.c +++ b/sys/compat/common/vm_43.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_43.c,v 1.3 2001/08/11 22:57:56 art Exp $ */ +/* $OpenBSD: vm_43.c,v 1.4 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: vm_43.c,v 1.1 1996/02/05 01:58:29 christos Exp $ */ /* @@ -62,7 +62,7 @@ #include <miscfs/specfs/specdev.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> /* ARGSUSED */ int diff --git a/sys/compat/freebsd/freebsd_exec.c b/sys/compat/freebsd/freebsd_exec.c index 26090b38769..27897a0ca09 100644 --- a/sys/compat/freebsd/freebsd_exec.c +++ b/sys/compat/freebsd/freebsd_exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: freebsd_exec.c,v 1.11 2001/09/19 13:28:43 art Exp $ */ +/* $OpenBSD: freebsd_exec.c,v 1.12 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: freebsd_exec.c,v 1.2 1996/05/18 16:02:08 christos Exp $ */ /* @@ -38,7 +38,7 @@ #include <sys/vnode.h> #include <sys/exec.h> #include <sys/resourcevar.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/exec_elf.h> #include <sys/exec_olf.h> diff --git a/sys/compat/hpux/hpux_exec.c b/sys/compat/hpux/hpux_exec.c index 248b7b34179..ed8d7bd2f2d 100644 --- a/sys/compat/hpux/hpux_exec.c +++ b/sys/compat/hpux/hpux_exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hpux_exec.c,v 1.12 2001/08/11 23:21:14 art Exp $ */ +/* $OpenBSD: hpux_exec.c,v 1.13 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: hpux_exec.c,v 1.8 1997/03/16 10:14:44 thorpej Exp $ */ /* @@ -47,7 +47,7 @@ #include <sys/mman.h> #include <sys/stat.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> #include <machine/reg.h> diff --git a/sys/compat/ibcs2/ibcs2_exec.c b/sys/compat/ibcs2/ibcs2_exec.c index 23eb34e0d70..128cba7df4e 100644 --- a/sys/compat/ibcs2/ibcs2_exec.c +++ b/sys/compat/ibcs2/ibcs2_exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ibcs2_exec.c,v 1.10 1999/11/10 15:55:21 mickey Exp $ */ +/* $OpenBSD: ibcs2_exec.c,v 1.11 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: ibcs2_exec.c,v 1.12 1996/10/12 02:13:52 thorpej Exp $ */ /* @@ -43,7 +43,7 @@ #include <sys/vnode.h> #include <sys/resourcevar.h> #include <sys/namei.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <compat/ibcs2/ibcs2_types.h> #include <compat/ibcs2/ibcs2_exec.h> diff --git a/sys/compat/ibcs2/ibcs2_ipc.c b/sys/compat/ibcs2/ibcs2_ipc.c index 43fe6ca1359..126f8ee8549 100644 --- a/sys/compat/ibcs2/ibcs2_ipc.c +++ b/sys/compat/ibcs2/ibcs2_ipc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ibcs2_ipc.c,v 1.5 1997/01/23 16:12:17 niklas Exp $ */ +/* $OpenBSD: ibcs2_ipc.c,v 1.6 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: ibcs2_ipc.c,v 1.7 1997/01/18 01:51:41 mycroft Exp $ */ /* @@ -56,7 +56,7 @@ #include <sys/shm.h> #include <sys/syscallargs.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <compat/ibcs2/ibcs2_types.h> #include <compat/ibcs2/ibcs2_signal.h> diff --git a/sys/compat/ibcs2/ibcs2_misc.c b/sys/compat/ibcs2/ibcs2_misc.c index aaa99ab480e..8688ded925e 100644 --- a/sys/compat/ibcs2/ibcs2_misc.c +++ b/sys/compat/ibcs2/ibcs2_misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ibcs2_misc.c,v 1.18 2001/07/10 11:07:25 espie Exp $ */ +/* $OpenBSD: ibcs2_misc.c,v 1.19 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: ibcs2_misc.c,v 1.23 1997/01/15 01:37:49 perry Exp $ */ /* @@ -86,7 +86,7 @@ #include <miscfs/specfs/specdev.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/sysctl.h> /* must be included after vm.h */ #include <i386/include/reg.h> diff --git a/sys/compat/ibcs2/ibcs2_stat.c b/sys/compat/ibcs2/ibcs2_stat.c index 9a076503551..97bba65505b 100644 --- a/sys/compat/ibcs2/ibcs2_stat.c +++ b/sys/compat/ibcs2/ibcs2_stat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ibcs2_stat.c,v 1.5 2000/09/07 17:52:23 ericj Exp $ */ +/* $OpenBSD: ibcs2_stat.c,v 1.6 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: ibcs2_stat.c,v 1.5 1996/05/03 17:05:32 christos Exp $ */ /* @@ -42,7 +42,7 @@ #include <sys/vnode.h> #include <sys/syscallargs.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <compat/ibcs2/ibcs2_types.h> #include <compat/ibcs2/ibcs2_fcntl.h> diff --git a/sys/compat/linux/linux_exec.c b/sys/compat/linux/linux_exec.c index 350c153bf0f..b4b527827f9 100644 --- a/sys/compat/linux/linux_exec.c +++ b/sys/compat/linux/linux_exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: linux_exec.c,v 1.17 2001/09/19 13:28:43 art Exp $ */ +/* $OpenBSD: linux_exec.c,v 1.18 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: linux_exec.c,v 1.13 1996/04/05 00:01:10 christos Exp $ */ /* @@ -46,7 +46,7 @@ #include <sys/mman.h> #include <sys/syscallargs.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> #include <machine/reg.h> diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 00e55426536..091b1d7b089 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: linux_misc.c,v 1.38 2001/08/12 20:33:50 mickey Exp $ */ +/* $OpenBSD: linux_misc.c,v 1.39 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: linux_misc.c,v 1.27 1996/05/20 01:59:21 fvdl Exp $ */ /* @@ -66,7 +66,7 @@ #include <sys/syscallargs.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <compat/linux/linux_types.h> #include <compat/linux/linux_fcntl.h> diff --git a/sys/compat/m68k4k/m68k4k_exec.c b/sys/compat/m68k4k/m68k4k_exec.c index ce2f79a46b7..f4563945c21 100644 --- a/sys/compat/m68k4k/m68k4k_exec.c +++ b/sys/compat/m68k4k/m68k4k_exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m68k4k_exec.c,v 1.3 1999/11/26 16:44:28 art Exp $ */ +/* $OpenBSD: m68k4k_exec.c,v 1.4 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: m68k4k_exec.c,v 1.1 1996/09/10 22:01:20 thorpej Exp $ */ /* @@ -54,7 +54,7 @@ #include <sys/exec.h> #include <sys/resourcevar.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <compat/m68k4k/m68k4k_exec.h> diff --git a/sys/compat/netbsd/netbsd_exec.c b/sys/compat/netbsd/netbsd_exec.c index 513a16b5b58..0999972b333 100644 --- a/sys/compat/netbsd/netbsd_exec.c +++ b/sys/compat/netbsd/netbsd_exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: netbsd_exec.c,v 1.9 2001/09/21 15:55:08 art Exp $ */ +/* $OpenBSD: netbsd_exec.c,v 1.10 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: svr4_exec.c,v 1.16 1995/10/14 20:24:20 christos Exp $ */ /* @@ -38,7 +38,7 @@ #include <sys/exec_olf.h> #include <sys/mman.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> #include <machine/reg.h> diff --git a/sys/compat/osf1/osf1_cvt.c b/sys/compat/osf1/osf1_cvt.c index d8c99097ee5..d96730a5b8d 100644 --- a/sys/compat/osf1/osf1_cvt.c +++ b/sys/compat/osf1/osf1_cvt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: osf1_cvt.c,v 1.1 2000/08/04 15:47:54 ericj Exp $ */ +/* $OpenBSD: osf1_cvt.c,v 1.2 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: osf1_cvt.c,v 1.7 1999/06/26 01:23:23 cgd Exp $ */ /* @@ -79,7 +79,7 @@ #include <sys/resource.h> #include <sys/resourcevar.h> #include <sys/wait.h> -#include <vm/vm.h> /* XXX see mmap emulation */ +#include <uvm/uvm_extern.h> /* XXX see mmap emulation */ #include <nfs/rpcv2.h> #include <nfs/nfsproto.h> diff --git a/sys/compat/osf1/osf1_mmap.c b/sys/compat/osf1/osf1_mmap.c index 590f9c3af8b..7592ed1e0df 100644 --- a/sys/compat/osf1/osf1_mmap.c +++ b/sys/compat/osf1/osf1_mmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: osf1_mmap.c,v 1.3 2001/06/27 04:58:41 art Exp $ */ +/* $OpenBSD: osf1_mmap.c,v 1.4 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: osf1_mmap.c,v 1.5 2000/04/11 05:26:27 chs Exp $ */ /* @@ -37,7 +37,6 @@ #include <sys/mman.h> #include <sys/mount.h> #include <sys/syscallargs.h> -#include <vm/vm.h> #include <uvm/uvm.h> #include <compat/osf1/osf1.h> diff --git a/sys/compat/sunos/sunos_exec.c b/sys/compat/sunos/sunos_exec.c index dd7b9da79f6..a975051308f 100644 --- a/sys/compat/sunos/sunos_exec.c +++ b/sys/compat/sunos/sunos_exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sunos_exec.c,v 1.13 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: sunos_exec.c,v 1.14 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: sunos_exec.c,v 1.11 1996/05/05 12:01:47 briggs Exp $ */ /* @@ -44,7 +44,7 @@ #include <sys/wait.h> #include <sys/mman.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> #include <machine/reg.h> diff --git a/sys/compat/sunos/sunos_misc.c b/sys/compat/sunos/sunos_misc.c index cb4a962dad5..6e92dd5c68b 100644 --- a/sys/compat/sunos/sunos_misc.c +++ b/sys/compat/sunos/sunos_misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sunos_misc.c,v 1.29 2001/10/31 10:56:10 art Exp $ */ +/* $OpenBSD: sunos_misc.c,v 1.30 2001/11/06 19:53:17 miod Exp $ */ /* $NetBSD: sunos_misc.c,v 1.65 1996/04/22 01:44:31 christos Exp $ */ /* @@ -101,7 +101,7 @@ #include <nfs/nfsproto.h> #include <nfs/nfs.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #ifdef sun3 # include <machine/machdep.h> /* for prototype of reboot2() */ diff --git a/sys/compat/svr4/svr4_exec.c b/sys/compat/svr4/svr4_exec.c index 257d5e36b43..33c77a100a6 100644 --- a/sys/compat/svr4/svr4_exec.c +++ b/sys/compat/svr4/svr4_exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: svr4_exec.c,v 1.12 2001/09/19 13:28:43 art Exp $ */ +/* $OpenBSD: svr4_exec.c,v 1.13 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: svr4_exec.c,v 1.16 1995/10/14 20:24:20 christos Exp $ */ /* @@ -40,7 +40,7 @@ #include <sys/exec_olf.h> #include <sys/mman.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> #include <machine/reg.h> diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c index b170785309b..9de5cf0e3ce 100644 --- a/sys/compat/svr4/svr4_misc.c +++ b/sys/compat/svr4/svr4_misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: svr4_misc.c,v 1.35 2001/08/28 18:25:14 jason Exp $ */ +/* $OpenBSD: svr4_misc.c,v 1.36 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: svr4_misc.c,v 1.42 1996/12/06 03:22:34 christos Exp $ */ /* @@ -89,8 +89,6 @@ #include <compat/common/compat_dir.h> -#include <vm/vm.h> - #include <uvm/uvm_extern.h> static __inline clock_t timeval_to_clock_t __P((struct timeval *)); diff --git a/sys/compat/svr4/svr4_stat.c b/sys/compat/svr4/svr4_stat.c index ca4ad6476b4..af41622d988 100644 --- a/sys/compat/svr4/svr4_stat.c +++ b/sys/compat/svr4/svr4_stat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: svr4_stat.c,v 1.19 2000/09/07 17:52:24 ericj Exp $ */ +/* $OpenBSD: svr4_stat.c,v 1.20 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: svr4_stat.c,v 1.21 1996/04/22 01:16:07 christos Exp $ */ /* @@ -43,7 +43,7 @@ #include <sys/time.h> #include <sys/ucred.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/sysctl.h> #include <sys/syscallargs.h> diff --git a/sys/compat/ultrix/ultrix_fs.c b/sys/compat/ultrix/ultrix_fs.c index 975a3e1f287..1c36b2910ef 100644 --- a/sys/compat/ultrix/ultrix_fs.c +++ b/sys/compat/ultrix/ultrix_fs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ultrix_fs.c,v 1.5 1998/02/13 14:38:24 deraadt Exp $ */ +/* $OpenBSD: ultrix_fs.c,v 1.6 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: ultrix_fs.c,v 1.4 1996/04/07 17:23:06 jonathan Exp $ */ /* @@ -45,7 +45,7 @@ #include <sys/syscallargs.h> #include <compat/ultrix/ultrix_syscallargs.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #define ULTRIX_MAXPATHLEN 1024 diff --git a/sys/compat/ultrix/ultrix_misc.c b/sys/compat/ultrix/ultrix_misc.c index f6885c3887b..c84f4dbed79 100644 --- a/sys/compat/ultrix/ultrix_misc.c +++ b/sys/compat/ultrix/ultrix_misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ultrix_misc.c,v 1.21 2001/10/31 10:56:11 art Exp $ */ +/* $OpenBSD: ultrix_misc.c,v 1.22 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: ultrix_misc.c,v 1.23 1996/04/07 17:23:04 jonathan Exp $ */ /* @@ -123,7 +123,7 @@ #include <nfs/nfsproto.h> #include <nfs/nfs.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/conf.h> /* iszerodev() */ #include <sys/socketvar.h> /* sosetopt() */ diff --git a/sys/crypto/criov.c b/sys/crypto/criov.c index 5f39e45fb3a..9088aee375b 100644 --- a/sys/crypto/criov.c +++ b/sys/crypto/criov.c @@ -1,4 +1,4 @@ -/* $OpenBSD: criov.c,v 1.7 2001/08/12 20:06:08 mickey Exp $ */ +/* $OpenBSD: criov.c,v 1.8 2001/11/06 19:53:18 miod Exp $ */ /* * Copyright (c) 1999 Theo de Raadt @@ -35,7 +35,7 @@ #include <sys/kernel.h> #include <sys/mbuf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <crypto/cryptodev.h> diff --git a/sys/crypto/cryptombuf.c b/sys/crypto/cryptombuf.c index 1d732f0e9ba..4e39757cd02 100644 --- a/sys/crypto/cryptombuf.c +++ b/sys/crypto/cryptombuf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cryptombuf.c,v 1.4 2001/08/12 20:06:08 mickey Exp $ */ +/* $OpenBSD: cryptombuf.c,v 1.5 2001/11/06 19:53:18 miod Exp $ */ /* * Copyright (c) 1999 Theo de Raadt @@ -35,7 +35,7 @@ #include <sys/kernel.h> #include <sys/mbuf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <crypto/cryptodev.h> diff --git a/sys/ddb/db_access.c b/sys/ddb/db_access.c index a3067b1624a..7622b6f6271 100644 --- a/sys/ddb/db_access.c +++ b/sys/ddb/db_access.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_access.c,v 1.7 1997/07/19 22:31:14 niklas Exp $ */ +/* $OpenBSD: db_access.c,v 1.8 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: db_access.c,v 1.8 1994/10/09 08:37:35 mycroft Exp $ */ /* @@ -33,7 +33,7 @@ #include <sys/param.h> #include <sys/proc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/db_machdep.h> /* type definitions */ #include <machine/endian.h> diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c index 45f531c80bc..c869a2794de 100644 --- a/sys/ddb/db_break.c +++ b/sys/ddb/db_break.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_break.c,v 1.9 2001/09/19 20:50:58 mickey Exp $ */ +/* $OpenBSD: db_break.c,v 1.10 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: db_break.c,v 1.7 1996/03/30 22:30:03 christos Exp $ */ /* @@ -36,7 +36,6 @@ #include <sys/param.h> #include <sys/proc.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <machine/db_machdep.h> /* type definitions */ diff --git a/sys/ddb/db_break.h b/sys/ddb/db_break.h index add79e0acb7..5be78bd0dd3 100644 --- a/sys/ddb/db_break.h +++ b/sys/ddb/db_break.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_break.h,v 1.5 1999/09/11 00:44:59 mickey Exp $ */ +/* $OpenBSD: db_break.h,v 1.6 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: db_break.h,v 1.8 1996/02/05 01:56:52 christos Exp $ */ /* @@ -33,7 +33,7 @@ #ifndef _DDB_DB_BREAK_H_ #define _DDB_DB_BREAK_H_ -#include <vm/vm.h> +#include <uvm/uvm_extern.h> /* * Breakpoints. diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c index e2165b8da6a..ff2428c6b90 100644 --- a/sys/ddb/db_command.c +++ b/sys/ddb/db_command.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_command.c,v 1.22 2001/07/04 22:15:15 espie Exp $ */ +/* $OpenBSD: db_command.c,v 1.23 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: db_command.c,v 1.20 1996/03/30 22:30:05 christos Exp $ */ /* @@ -36,7 +36,7 @@ #include <sys/reboot.h> #include <sys/extent.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/db_machdep.h> /* type definitions */ #include <ddb/db_lex.h> @@ -50,9 +50,6 @@ #include <ddb/db_sym.h> #include <ddb/db_extern.h> -#include <vm/vm.h> - -#include <uvm/uvm_extern.h> #include <uvm/uvm_ddb.h> /* diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c index 8a157f407e6..1c9f046f6b5 100644 --- a/sys/ddb/db_examine.c +++ b/sys/ddb/db_examine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_examine.c,v 1.8 1997/07/19 22:31:16 niklas Exp $ */ +/* $OpenBSD: db_examine.c,v 1.9 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: db_examine.c,v 1.11 1996/03/30 22:30:07 christos Exp $ */ /* @@ -33,7 +33,7 @@ #include <sys/param.h> #include <sys/proc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/db_machdep.h> /* type definitions */ diff --git a/sys/ddb/db_expr.c b/sys/ddb/db_expr.c index e760e653038..f1fda9facb4 100644 --- a/sys/ddb/db_expr.c +++ b/sys/ddb/db_expr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_expr.c,v 1.6 1997/07/19 22:31:17 niklas Exp $ */ +/* $OpenBSD: db_expr.c,v 1.7 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: db_expr.c,v 1.5 1996/02/05 01:56:58 christos Exp $ */ /* @@ -33,7 +33,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/ddb/db_hangman.c b/sys/ddb/db_hangman.c index 7ffeb91736f..baed0ea9ff0 100644 --- a/sys/ddb/db_hangman.c +++ b/sys/ddb/db_hangman.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_hangman.c,v 1.18 2001/06/29 05:28:18 mickey Exp $ */ +/* $OpenBSD: db_hangman.c,v 1.19 2001/11/06 19:53:18 miod Exp $ */ /* * Copyright (c) 1996 Theo de Raadt, Michael Shalayeff @@ -33,7 +33,7 @@ #include <sys/param.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/db_machdep.h> diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c index e59e521fed8..274efccff40 100644 --- a/sys/ddb/db_input.c +++ b/sys/ddb/db_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_input.c,v 1.7 1997/07/19 22:31:18 niklas Exp $ */ +/* $OpenBSD: db_input.c,v 1.8 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: db_input.c,v 1.7 1996/02/05 01:57:02 christos Exp $ */ /* @@ -33,7 +33,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/ddb/db_lex.c b/sys/ddb/db_lex.c index 90492926669..983eb3f704c 100644 --- a/sys/ddb/db_lex.c +++ b/sys/ddb/db_lex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_lex.c,v 1.6 1997/07/19 22:31:18 niklas Exp $ */ +/* $OpenBSD: db_lex.c,v 1.7 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: db_lex.c,v 1.8 1996/02/05 01:57:05 christos Exp $ */ /* @@ -36,7 +36,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/ddb/db_output.c b/sys/ddb/db_output.c index 75f4e276d3e..89894226433 100644 --- a/sys/ddb/db_output.c +++ b/sys/ddb/db_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_output.c,v 1.15 2001/07/04 23:14:53 espie Exp $ */ +/* $OpenBSD: db_output.c,v 1.16 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: db_output.c,v 1.13 1996/04/01 17:27:14 christos Exp $ */ /* @@ -37,7 +37,7 @@ #include <dev/cons.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/db_machdep.h> diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c index 5aad9ed8827..8f4b91863a4 100644 --- a/sys/ddb/db_print.c +++ b/sys/ddb/db_print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_print.c,v 1.6 1997/07/19 22:31:20 niklas Exp $ */ +/* $OpenBSD: db_print.c,v 1.7 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: db_print.c,v 1.5 1996/02/05 01:57:11 christos Exp $ */ /* @@ -36,7 +36,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/ddb/db_run.c b/sys/ddb/db_run.c index 8cd3a4545cd..e89ce68fdf3 100644 --- a/sys/ddb/db_run.c +++ b/sys/ddb/db_run.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_run.c,v 1.14 2001/07/04 23:14:53 espie Exp $ */ +/* $OpenBSD: db_run.c,v 1.15 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: db_run.c,v 1.8 1996/02/05 01:57:12 christos Exp $ */ /* @@ -36,7 +36,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/ddb/db_trap.c b/sys/ddb/db_trap.c index aa0dfe35060..c0f9367fe24 100644 --- a/sys/ddb/db_trap.c +++ b/sys/ddb/db_trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_trap.c,v 1.9 2001/08/19 19:47:45 art Exp $ */ +/* $OpenBSD: db_trap.c,v 1.10 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: db_trap.c,v 1.9 1996/02/05 01:57:18 christos Exp $ */ /* @@ -37,7 +37,7 @@ #include <sys/proc.h> #include <sys/systm.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/db_machdep.h> diff --git a/sys/ddb/db_usrreq.c b/sys/ddb/db_usrreq.c index d0557fde62f..be1a5e730ed 100644 --- a/sys/ddb/db_usrreq.c +++ b/sys/ddb/db_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_usrreq.c,v 1.4 2000/02/27 04:57:29 hugh Exp $ */ +/* $OpenBSD: db_usrreq.c,v 1.5 2001/11/06 19:53:18 miod Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff. All rights reserved. @@ -33,7 +33,7 @@ #include <sys/types.h> #include <sys/kernel.h> #include <sys/proc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/sysctl.h> #include <ddb/db_var.h> diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c index a1f3521b549..546a238f13e 100644 --- a/sys/ddb/db_variables.c +++ b/sys/ddb/db_variables.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_variables.c,v 1.7 1997/07/19 22:31:21 niklas Exp $ */ +/* $OpenBSD: db_variables.c,v 1.8 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: db_variables.c,v 1.8 1996/02/05 01:57:19 christos Exp $ */ /* @@ -30,7 +30,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/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c index 2d64788591e..171cee6525f 100644 --- a/sys/ddb/db_write_cmd.c +++ b/sys/ddb/db_write_cmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_write_cmd.c,v 1.5 1997/07/19 22:31:22 niklas Exp $ */ +/* $OpenBSD: db_write_cmd.c,v 1.6 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: db_write_cmd.c,v 1.6 1996/02/05 01:57:25 christos Exp $ */ /* @@ -33,7 +33,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/dev/ata/wd.c b/sys/dev/ata/wd.c index 68455c9aced..dd7ce403c51 100644 --- a/sys/dev/ata/wd.c +++ b/sys/dev/ata/wd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wd.c,v 1.19 2001/08/06 20:50:28 miod Exp $ */ +/* $OpenBSD: wd.c,v 1.20 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */ /* @@ -90,7 +90,7 @@ #endif #include <sys/vnode.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/intr.h> #include <machine/bus.h> diff --git a/sys/dev/atapiscsi/atapiscsi.c b/sys/dev/atapiscsi/atapiscsi.c index a1473bc9634..6cc954e0ace 100644 --- a/sys/dev/atapiscsi/atapiscsi.c +++ b/sys/dev/atapiscsi/atapiscsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atapiscsi.c,v 1.53 2001/08/25 19:29:16 fgsch Exp $ */ +/* $OpenBSD: atapiscsi.c,v 1.54 2001/11/06 19:53:18 miod Exp $ */ /* * This code is derived from code with the copyright below. @@ -56,7 +56,7 @@ #include <scsi/scsi_tape.h> #include <scsi/scsiconf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/bus.h> #include <machine/cpu.h> diff --git a/sys/dev/audio.c b/sys/dev/audio.c index 551c7de96b6..28fff9ef192 100644 --- a/sys/dev/audio.c +++ b/sys/dev/audio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: audio.c,v 1.31 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: audio.c,v 1.32 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: audio.c,v 1.105 1998/09/27 16:43:56 christos Exp $ */ /* @@ -85,7 +85,7 @@ #include <dev/rndvar.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/endian.h> diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c index 9da3130e65e..511a4f96176 100644 --- a/sys/dev/ccd.c +++ b/sys/dev/ccd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ccd.c,v 1.44 2001/09/19 20:50:58 mickey Exp $ */ +/* $OpenBSD: ccd.c,v 1.45 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: ccd.c,v 1.33 1996/05/05 04:21:14 thorpej Exp $ */ /*- @@ -116,7 +116,6 @@ #include <dev/ccdvar.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #ifdef __GNUC__ diff --git a/sys/dev/eisa/if_fea.c b/sys/dev/eisa/if_fea.c index ddc9176687d..5b8f6af72d4 100644 --- a/sys/dev/eisa/if_fea.c +++ b/sys/dev/eisa/if_fea.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fea.c,v 1.11 2001/09/21 17:55:43 miod Exp $ */ +/* $OpenBSD: if_fea.c,v 1.12 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: if_fea.c,v 1.9 1996/10/21 22:31:05 thorpej Exp $ */ /*- @@ -65,7 +65,7 @@ #include <net/if_fddi.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> #include <machine/bus.h> diff --git a/sys/dev/i2o/iop.c b/sys/dev/i2o/iop.c index a3c20855c8f..dec24f5800a 100644 --- a/sys/dev/i2o/iop.c +++ b/sys/dev/i2o/iop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iop.c,v 1.20 2001/11/05 17:25:58 art Exp $ */ +/* $OpenBSD: iop.c,v 1.21 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: iop.c,v 1.12 2001/03/21 14:27:05 ad Exp $ */ /*- @@ -53,7 +53,6 @@ #include <sys/conf.h> #include <sys/kthread.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <machine/bus.h> diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c index 1b69cbd1821..7f7b49a688a 100644 --- a/sys/dev/ic/aac.c +++ b/sys/dev/ic/aac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aac.c,v 1.9 2001/11/05 17:25:58 art Exp $ */ +/* $OpenBSD: aac.c,v 1.10 2001/11/06 19:53:18 miod Exp $ */ /*- * Copyright (c) 2000 Michael Smith @@ -51,7 +51,7 @@ #include <machine/bus.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <scsi/scsi_all.h> #include <scsi/scsi_disk.h> diff --git a/sys/dev/ic/adv.c b/sys/dev/ic/adv.c index 5200e1d0b78..023b9ec3c3c 100644 --- a/sys/dev/ic/adv.c +++ b/sys/dev/ic/adv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adv.c,v 1.10 2001/11/05 17:25:58 art Exp $ */ +/* $OpenBSD: adv.c,v 1.11 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: adv.c,v 1.6 1998/10/28 20:39:45 dante Exp $ */ /* @@ -53,7 +53,7 @@ #include <machine/bus.h> #include <machine/intr.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <scsi/scsi_all.h> #include <scsi/scsiconf.h> diff --git a/sys/dev/ic/advlib.c b/sys/dev/ic/advlib.c index 8d50a8c43cf..e44145d4eaf 100644 --- a/sys/dev/ic/advlib.c +++ b/sys/dev/ic/advlib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: advlib.c,v 1.6 2001/08/12 20:33:50 mickey Exp $ */ +/* $OpenBSD: advlib.c,v 1.7 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: advlib.c,v 1.7 1998/10/28 20:39:46 dante Exp $ */ /* @@ -67,7 +67,7 @@ #include <scsi/scsi_all.h> #include <scsi/scsiconf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <dev/ic/adv.h> #include <dev/ic/advlib.h> diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c index 6ab8bb987d4..cdbdacfd710 100644 --- a/sys/dev/ic/adw.c +++ b/sys/dev/ic/adw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adw.c,v 1.23 2001/11/05 17:25:58 art Exp $ */ +/* $OpenBSD: adw.c,v 1.24 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: adw.c,v 1.23 2000/05/27 18:24:50 dante Exp $ */ /* @@ -54,7 +54,7 @@ #include <machine/bus.h> #include <machine/intr.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <scsi/scsi_all.h> #include <scsi/scsiconf.h> diff --git a/sys/dev/ic/adwlib.c b/sys/dev/ic/adwlib.c index 9c32768b15e..032f00b6a25 100644 --- a/sys/dev/ic/adwlib.c +++ b/sys/dev/ic/adwlib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adwlib.c,v 1.14 2001/07/11 17:31:25 krw Exp $ */ +/* $OpenBSD: adwlib.c,v 1.15 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: adwlib.c,v 1.20 2000/07/04 04:17:03 itojun Exp $ */ /* @@ -68,7 +68,7 @@ #include <dev/pci/pcidevs.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <dev/ic/adwlib.h> #include <dev/microcode/adw/adwmcode.h> diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c index d1bbca9dd1b..2ea3fa6c03a 100644 --- a/sys/dev/ic/aic7xxx.c +++ b/sys/dev/ic/aic7xxx.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.40 2000/01/07 23:08:17 gibbs Exp $ - * $OpenBSD: aic7xxx.c,v 1.32 2001/11/05 17:25:58 art Exp $ + * $OpenBSD: aic7xxx.c,v 1.33 2001/11/06 19:53:18 miod Exp $ */ /* * A few notes on features of the driver. @@ -100,7 +100,7 @@ #include <scsi/scsi_debug.h> #include <scsi/scsiconf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <dev/ic/aic7xxxreg.h> #include <dev/ic/aic7xxxvar.h> diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c index 35a73263a2d..1c761cf930f 100644 --- a/sys/dev/ic/ami.c +++ b/sys/dev/ic/ami.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ami.c,v 1.12 2001/11/05 17:25:58 art Exp $ */ +/* $OpenBSD: ami.c,v 1.13 2001/11/06 19:53:18 miod Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -60,7 +60,6 @@ #include <machine/bus.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <scsi/scsi_all.h> diff --git a/sys/dev/ic/bt463.c b/sys/dev/ic/bt463.c index 2e9cbb91e85..8d3ee43af99 100644 --- a/sys/dev/ic/bt463.c +++ b/sys/dev/ic/bt463.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bt463.c,v 1.4 2001/06/27 04:45:57 art Exp $ */ +/* $OpenBSD: bt463.c,v 1.5 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: bt463.c,v 1.2 2000/06/13 17:21:06 nathanw Exp $ */ /*- @@ -76,7 +76,7 @@ #include <sys/kernel.h> #include <sys/malloc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <dev/pci/pcivar.h> #include <dev/pci/tgareg.h> diff --git a/sys/dev/ic/bt485.c b/sys/dev/ic/bt485.c index 0522246f238..203ed7995bf 100644 --- a/sys/dev/ic/bt485.c +++ b/sys/dev/ic/bt485.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bt485.c,v 1.6 2001/06/27 04:45:58 art Exp $ */ +/* $OpenBSD: bt485.c,v 1.7 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: bt485.c,v 1.2 2000/04/02 18:55:01 nathanw Exp $ */ /* @@ -39,7 +39,7 @@ #include <sys/kernel.h> #include <sys/malloc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <dev/pci/pcivar.h> #include <dev/ic/bt485reg.h> diff --git a/sys/dev/ic/cac.c b/sys/dev/ic/cac.c index 0dc2bbaf0bd..01c44d9ed33 100644 --- a/sys/dev/ic/cac.c +++ b/sys/dev/ic/cac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cac.c,v 1.8 2001/11/05 17:25:58 art Exp $ */ +/* $OpenBSD: cac.c,v 1.9 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: cac.c,v 1.15 2000/11/08 19:20:35 ad Exp $ */ /* @@ -87,7 +87,6 @@ #include <sys/malloc.h> #include <sys/pool.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <machine/bus.h> diff --git a/sys/dev/ic/dc.c b/sys/dev/ic/dc.c index 85212ccc4ee..e8463ecc594 100644 --- a/sys/dev/ic/dc.c +++ b/sys/dev/ic/dc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dc.c,v 1.33 2001/08/22 16:38:38 aaron Exp $ */ +/* $OpenBSD: dc.c,v 1.34 2001/11/06 19:53:18 miod Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -122,7 +122,7 @@ #include <net/bpf.h> #endif -#include <vm/vm.h> /* for vtophys */ +#include <uvm/uvm_extern.h> /* for vtophys */ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> diff --git a/sys/dev/ic/fxp.c b/sys/dev/ic/fxp.c index e107cb76b81..bc1f57e079b 100644 --- a/sys/dev/ic/fxp.c +++ b/sys/dev/ic/fxp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fxp.c,v 1.29 2001/11/05 17:25:58 art Exp $ */ +/* $OpenBSD: fxp.c,v 1.30 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: if_fxp.c,v 1.2 1997/06/05 02:01:55 thorpej Exp $ */ /* @@ -82,7 +82,7 @@ #include <netinet/if_ether.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> #include <machine/bus.h> diff --git a/sys/dev/ic/gdt_common.c b/sys/dev/ic/gdt_common.c index 90e139dac90..dcac4ac513b 100644 --- a/sys/dev/ic/gdt_common.c +++ b/sys/dev/ic/gdt_common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gdt_common.c,v 1.15 2001/11/05 17:25:58 art Exp $ */ +/* $OpenBSD: gdt_common.c,v 1.16 2001/11/06 19:53:18 miod Exp $ */ /* * Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved. @@ -43,7 +43,7 @@ #include <machine/bus.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <scsi/scsi_all.h> #include <scsi/scsi_disk.h> diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c index 495690e03d5..506346ccd1a 100644 --- a/sys/dev/ic/gem.c +++ b/sys/dev/ic/gem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gem.c,v 1.11 2001/10/03 18:18:01 jason Exp $ */ +/* $OpenBSD: gem.c,v 1.12 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: gem.c,v 1.1 2001/09/16 00:11:43 eeh Exp $ */ /* @@ -51,7 +51,6 @@ #include <machine/endian.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <net/if.h> diff --git a/sys/dev/ic/i82365.c b/sys/dev/ic/i82365.c index b3618b3095b..fe75659725d 100644 --- a/sys/dev/ic/i82365.c +++ b/sys/dev/ic/i82365.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i82365.c,v 1.20 2001/08/17 20:44:11 millert Exp $ */ +/* $OpenBSD: i82365.c,v 1.21 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: i82365.c,v 1.10 1998/06/09 07:36:55 thorpej Exp $ */ /* @@ -39,7 +39,7 @@ #include <sys/malloc.h> #include <sys/kthread.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/bus.h> #include <machine/intr.h> diff --git a/sys/dev/ic/i82596.c b/sys/dev/ic/i82596.c index 9bd7b984aa8..b1ae92ea14b 100644 --- a/sys/dev/ic/i82596.c +++ b/sys/dev/ic/i82596.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i82596.c,v 1.6 2001/06/27 06:34:42 kjc Exp $ */ +/* $OpenBSD: i82596.c,v 1.7 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: i82586.c,v 1.18 1998/08/15 04:42:42 mycroft Exp $ */ /*- @@ -170,7 +170,7 @@ Mode of operation: #include <netinet/if_ether.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/bus.h> diff --git a/sys/dev/ic/isp_openbsd.h b/sys/dev/ic/isp_openbsd.h index ddc0aa3e06d..408551e8303 100644 --- a/sys/dev/ic/isp_openbsd.h +++ b/sys/dev/ic/isp_openbsd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isp_openbsd.h,v 1.16 2001/09/01 07:16:40 mjacob Exp $ */ +/* $OpenBSD: isp_openbsd.h,v 1.17 2001/11/06 19:53:18 miod Exp $ */ /* * OpenBSD Specific definitions for the Qlogic ISP Host Adapter */ @@ -48,7 +48,7 @@ #include <scsi/scsi_message.h> #include <scsi/scsi_debug.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #define ISP_PLATFORM_VERSION_MAJOR 2 diff --git a/sys/dev/ic/lsi64854.c b/sys/dev/ic/lsi64854.c index dea5b6612b1..290244dbcbc 100644 --- a/sys/dev/ic/lsi64854.c +++ b/sys/dev/ic/lsi64854.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lsi64854.c,v 1.3 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: lsi64854.c,v 1.4 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: lsi64854.c,v 1.18 2001/06/04 20:56:51 mrg Exp $ */ /*- @@ -44,7 +44,6 @@ #include <sys/errno.h> #include <sys/device.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <machine/bus.h> diff --git a/sys/dev/ic/midway.c b/sys/dev/ic/midway.c index 107350bc320..bbbbd6ae2be 100644 --- a/sys/dev/ic/midway.c +++ b/sys/dev/ic/midway.c @@ -1,4 +1,4 @@ -/* $OpenBSD: midway.c,v 1.28 2001/06/27 06:34:42 kjc Exp $ */ +/* $OpenBSD: midway.c,v 1.29 2001/11/06 19:53:18 miod Exp $ */ /* (sync'd to midway.c 1.68) */ /* @@ -132,7 +132,7 @@ #include <net/if.h> #include <net/if_atm.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #ifdef INET #include <netinet/if_atm.h> diff --git a/sys/dev/ic/pdq_ifsubr.c b/sys/dev/ic/pdq_ifsubr.c index 775a5c399d5..198091004d7 100644 --- a/sys/dev/ic/pdq_ifsubr.c +++ b/sys/dev/ic/pdq_ifsubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pdq_ifsubr.c,v 1.9 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: pdq_ifsubr.c,v 1.10 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: pdq_ifsubr.c,v 1.5 1996/05/20 00:26:21 thorpej Exp $ */ /*- @@ -83,7 +83,7 @@ #include <netns/ns_if.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include "pdqvar.h" #include "pdqreg.h" diff --git a/sys/dev/ic/pdqvar.h b/sys/dev/ic/pdqvar.h index 2286f72e86a..1bc491d86fb 100644 --- a/sys/dev/ic/pdqvar.h +++ b/sys/dev/ic/pdqvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pdqvar.h,v 1.13 2001/09/19 20:50:58 mickey Exp $ */ +/* $OpenBSD: pdqvar.h,v 1.14 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: pdqvar.h,v 1.11 1996/10/25 21:33:37 cgd Exp $ */ /*- @@ -70,7 +70,6 @@ enum _pdq_type_t { #include <sys/mbuf.h> #endif /* M_CAST */ #include <sys/malloc.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #define PDQ_USE_MBUFS diff --git a/sys/dev/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c index 43d4e71f276..8fbe3b4496b 100644 --- a/sys/dev/ic/rtl81x9.c +++ b/sys/dev/ic/rtl81x9.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtl81x9.c,v 1.10 2001/10/24 16:56:56 mickey Exp $ */ +/* $OpenBSD: rtl81x9.c,v 1.11 2001/11/06 19:53:18 miod Exp $ */ /* * Copyright (c) 1997, 1998 @@ -114,7 +114,7 @@ #include <net/bpf.h> #endif -#include <vm/vm.h> /* for vtophys */ +#include <uvm/uvm_extern.h> /* for vtophys */ #include <machine/bus.h> #include <dev/mii/mii.h> diff --git a/sys/dev/ic/sti.c b/sys/dev/ic/sti.c index 49d771c4b87..2029603fdab 100644 --- a/sys/dev/ic/sti.c +++ b/sys/dev/ic/sti.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sti.c,v 1.6 2001/09/19 20:50:58 mickey Exp $ */ +/* $OpenBSD: sti.c,v 1.7 2001/11/06 19:53:18 miod Exp $ */ /* * Copyright (c) 2000-2001 Michael Shalayeff @@ -42,7 +42,6 @@ #include <sys/device.h> #include <sys/malloc.h> -#include <vm/vm.h> #include <uvm/uvm.h> #include <machine/bus.h> diff --git a/sys/dev/ic/tcic2.c b/sys/dev/ic/tcic2.c index 14d3fa3b371..9be231ae4e7 100644 --- a/sys/dev/ic/tcic2.c +++ b/sys/dev/ic/tcic2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcic2.c,v 1.1 2000/05/15 04:17:28 jason Exp $ */ +/* $OpenBSD: tcic2.c,v 1.2 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: tcic2.c,v 1.3 2000/01/13 09:38:17 joda Exp $ */ #undef TCICDEBUG @@ -41,7 +41,7 @@ #include <sys/malloc.h> #include <sys/kthread.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/bus.h> #include <machine/intr.h> diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c index c3f6d2917cd..13bac8fbd39 100644 --- a/sys/dev/ic/wdc.c +++ b/sys/dev/ic/wdc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdc.c,v 1.42 2001/08/23 13:23:28 art Exp $ */ +/* $OpenBSD: wdc.c,v 1.43 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: wdc.c,v 1.68 1999/06/23 19:00:17 bouyer Exp $ */ @@ -77,7 +77,7 @@ #include <sys/syslog.h> #include <sys/proc.h> #include <sys/pool.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/intr.h> #include <machine/bus.h> diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c index c22dbe2fae3..add5997203b 100644 --- a/sys/dev/ic/xl.c +++ b/sys/dev/ic/xl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xl.c,v 1.30 2001/08/19 18:07:33 jason Exp $ */ +/* $OpenBSD: xl.c,v 1.31 2001/11/06 19:53:18 miod Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -142,7 +142,7 @@ #include <net/bpf.h> #endif -#include <vm/vm.h> /* for vtophys */ +#include <uvm/uvm_extern.h> /* for vtophys */ #include <dev/ic/xlreg.h> diff --git a/sys/dev/isa/ad1848.c b/sys/dev/isa/ad1848.c index 71ff0985d27..a849f1d3455 100644 --- a/sys/dev/isa/ad1848.c +++ b/sys/dev/isa/ad1848.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ad1848.c,v 1.22 2001/10/31 11:00:24 art Exp $ */ +/* $OpenBSD: ad1848.c,v 1.23 2001/11/06 19:53:19 miod Exp $ */ /* $NetBSD: ad1848.c,v 1.45 1998/01/30 02:02:38 augustss Exp $ */ /* @@ -80,7 +80,7 @@ #include <machine/bus.h> #include <sys/audioio.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <dev/audio_if.h> #include <dev/auconv.h> diff --git a/sys/dev/isa/aria.c b/sys/dev/isa/aria.c index 1fe2fadce81..3e650286d76 100644 --- a/sys/dev/isa/aria.c +++ b/sys/dev/isa/aria.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aria.c,v 1.5 1999/01/07 06:14:47 niklas Exp $ */ +/* $OpenBSD: aria.c,v 1.6 2001/11/06 19:53:19 miod Exp $ */ /* * Copyright (c) 1995, 1996 Roland C. Dowdeswell. All rights reserved. @@ -66,7 +66,7 @@ #include <sys/device.h> #include <sys/proc.h> #include <sys/buf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> #include <machine/pio.h> diff --git a/sys/dev/isa/i82365_isa.c b/sys/dev/isa/i82365_isa.c index fa6ff2b2265..5ecec8e568c 100644 --- a/sys/dev/isa/i82365_isa.c +++ b/sys/dev/isa/i82365_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i82365_isa.c,v 1.14 2001/09/21 17:55:43 miod Exp $ */ +/* $OpenBSD: i82365_isa.c,v 1.15 2001/11/06 19:53:19 miod Exp $ */ /* $NetBSD: i82365_isa.c,v 1.11 1998/06/09 07:25:00 thorpej Exp $ */ /* @@ -38,7 +38,7 @@ #include <sys/extent.h> #include <sys/malloc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/bus.h> #include <machine/intr.h> diff --git a/sys/dev/isa/i82365_isapnp.c b/sys/dev/isa/i82365_isapnp.c index c9e8833c695..ad9f8a8f6ab 100644 --- a/sys/dev/isa/i82365_isapnp.c +++ b/sys/dev/isa/i82365_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i82365_isapnp.c,v 1.2 2001/09/21 17:55:43 miod Exp $ */ +/* $OpenBSD: i82365_isapnp.c,v 1.3 2001/11/06 19:53:19 miod Exp $ */ /* $NetBSD: i82365_isapnp.c,v 1.8 2000/02/23 17:22:11 soren Exp $ */ /* @@ -40,7 +40,7 @@ #include <sys/extent.h> #include <sys/malloc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/bus.h> #include <machine/intr.h> diff --git a/sys/dev/isa/i82365_isasubr.c b/sys/dev/isa/i82365_isasubr.c index 2519159c058..944e9ab7817 100644 --- a/sys/dev/isa/i82365_isasubr.c +++ b/sys/dev/isa/i82365_isasubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i82365_isasubr.c,v 1.15 2001/08/17 21:52:16 deraadt Exp $ */ +/* $OpenBSD: i82365_isasubr.c,v 1.16 2001/11/06 19:53:19 miod Exp $ */ /* $NetBSD: i82365_isasubr.c,v 1.1 1998/06/07 18:28:31 sommerfe Exp $ */ /* @@ -39,7 +39,7 @@ #include <sys/extent.h> #include <sys/malloc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/bus.h> #include <machine/intr.h> diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c index d96e8592f4f..ec7dac44f7b 100644 --- a/sys/dev/isa/if_ie.c +++ b/sys/dev/isa/if_ie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie.c,v 1.22 2001/06/27 06:34:46 kjc Exp $ */ +/* $OpenBSD: if_ie.c,v 1.23 2001/11/06 19:53:19 miod Exp $ */ /* $NetBSD: if_ie.c,v 1.51 1996/05/12 23:52:48 mycroft Exp $ */ /*- @@ -139,7 +139,7 @@ iomem, and to make 16-pointers, we subtract sc_maddr and and with 0xffff. #include <netinet/if_ether.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> #include <machine/pio.h> /* XXX convert this driver! */ diff --git a/sys/dev/isa/if_iy.c b/sys/dev/isa/if_iy.c index 56aa82081f7..9857cf2391a 100644 --- a/sys/dev/isa/if_iy.c +++ b/sys/dev/isa/if_iy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iy.c,v 1.14 2001/06/27 06:34:47 kjc Exp $ */ +/* $OpenBSD: if_iy.c,v 1.15 2001/11/06 19:53:19 miod Exp $ */ /* $NetBSD: if_iy.c,v 1.4 1996/05/12 23:52:53 mycroft Exp $ */ /* #define IYDEBUG */ /* #define IYMEMDEBUG */ @@ -72,7 +72,7 @@ #include <netns/ns_if.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> #include <machine/intr.h> diff --git a/sys/dev/isa/if_le.c b/sys/dev/isa/if_le.c index 7d19e483720..f5b2f35a26a 100644 --- a/sys/dev/isa/if_le.c +++ b/sys/dev/isa/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.14 1998/09/16 22:41:20 jason Exp $ */ +/* $OpenBSD: if_le.c,v 1.15 2001/11/06 19:53:19 miod Exp $ */ /* $NetBSD: if_le_isa.c,v 1.2 1996/05/12 23:52:56 mycroft Exp $ */ /*- @@ -58,7 +58,7 @@ #include <netinet/if_ether.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> #include <machine/intr.h> diff --git a/sys/dev/isa/if_le_isa.c b/sys/dev/isa/if_le_isa.c index e43282dd42f..22cd36720be 100644 --- a/sys/dev/isa/if_le_isa.c +++ b/sys/dev/isa/if_le_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_isa.c,v 1.14 1998/09/16 22:41:21 jason Exp $ */ +/* $OpenBSD: if_le_isa.c,v 1.15 2001/11/06 19:53:19 miod Exp $ */ /* $NetBSD: if_le_isa.c,v 1.2 1996/05/12 23:52:56 mycroft Exp $ */ /*- @@ -58,7 +58,7 @@ #include <netinet/if_ether.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> #include <machine/intr.h> diff --git a/sys/dev/isa/if_le_isapnp.c b/sys/dev/isa/if_le_isapnp.c index 8d6b95e763f..86dfacd3800 100644 --- a/sys/dev/isa/if_le_isapnp.c +++ b/sys/dev/isa/if_le_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_isapnp.c,v 1.7 1999/03/08 11:17:08 deraadt Exp $ */ +/* $OpenBSD: if_le_isapnp.c,v 1.8 2001/11/06 19:53:19 miod Exp $ */ /* $NetBSD: if_le_isa.c,v 1.2 1996/05/12 23:52:56 mycroft Exp $ */ /*- @@ -58,7 +58,7 @@ #include <netinet/if_ether.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> #include <machine/intr.h> diff --git a/sys/dev/isa/isadma.c b/sys/dev/isa/isadma.c index b108e4d52ae..f27817e64be 100644 --- a/sys/dev/isa/isadma.c +++ b/sys/dev/isa/isadma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isadma.c,v 1.24 2001/11/05 17:25:58 art Exp $ */ +/* $OpenBSD: isadma.c,v 1.25 2001/11/06 19:53:19 miod Exp $ */ /* $NetBSD: isadma.c,v 1.32 1997/09/05 01:48:33 thorpej Exp $ */ /*- @@ -47,7 +47,7 @@ #include <sys/proc.h> #include <sys/device.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/bus.h> diff --git a/sys/dev/isa/mpu401.c b/sys/dev/isa/mpu401.c index ac09dc28aad..82079d04863 100644 --- a/sys/dev/isa/mpu401.c +++ b/sys/dev/isa/mpu401.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpu401.c,v 1.4 1999/08/05 05:32:40 deraadt Exp $ */ +/* $OpenBSD: mpu401.c,v 1.5 2001/11/06 19:53:19 miod Exp $ */ /* $NetBSD: mpu401.c,v 1.3 1998/11/25 22:17:06 augustss Exp $ */ /* @@ -45,7 +45,7 @@ #include <sys/device.h> #include <sys/proc.h> #include <sys/buf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> #include <machine/intr.h> diff --git a/sys/dev/isa/sbdsp.c b/sys/dev/isa/sbdsp.c index 5cdf4a8ec4e..a716fa24fb6 100644 --- a/sys/dev/isa/sbdsp.c +++ b/sys/dev/isa/sbdsp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbdsp.c,v 1.17 2001/10/31 11:00:24 art Exp $ */ +/* $OpenBSD: sbdsp.c,v 1.18 2001/11/06 19:53:19 miod Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -54,7 +54,7 @@ #include <sys/device.h> #include <sys/proc.h> #include <sys/buf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> #include <machine/intr.h> diff --git a/sys/dev/isa/tcic2_isa.c b/sys/dev/isa/tcic2_isa.c index aa91660a958..d5f20b5c65b 100644 --- a/sys/dev/isa/tcic2_isa.c +++ b/sys/dev/isa/tcic2_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcic2_isa.c,v 1.2 2001/08/17 21:52:16 deraadt Exp $ */ +/* $OpenBSD: tcic2_isa.c,v 1.3 2001/11/06 19:53:19 miod Exp $ */ /* $NetBSD: tcic2_isa.c,v 1.2 1999/04/08 16:14:29 bad Exp $ */ #undef TCICISADEBUG @@ -42,7 +42,7 @@ #include <sys/extent.h> #include <sys/malloc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/bus.h> #include <machine/intr.h> diff --git a/sys/dev/ksyms.c b/sys/dev/ksyms.c index 6b2a9c8053e..81654474b56 100644 --- a/sys/dev/ksyms.c +++ b/sys/dev/ksyms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ksyms.c,v 1.10 2001/11/01 12:13:47 art Exp $ */ +/* $OpenBSD: ksyms.c,v 1.11 2001/11/06 19:53:18 miod Exp $ */ /* * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> * Copyright (c) 2001 Artur Grabowski <art@openbsd.org> @@ -41,7 +41,7 @@ #include <machine/cpu.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> extern char *esym; /* end of symbol table */ #ifdef __sparc64__ diff --git a/sys/dev/microcode/adw/adwmcode.c b/sys/dev/microcode/adw/adwmcode.c index f6850e37ab2..58c7ede3937 100644 --- a/sys/dev/microcode/adw/adwmcode.c +++ b/sys/dev/microcode/adw/adwmcode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adwmcode.c,v 1.1 2001/04/11 03:55:00 krw Exp $ */ +/* $OpenBSD: adwmcode.c,v 1.2 2001/11/06 19:53:19 miod Exp $ */ /* $NetBSD: adwmcode.c,v 1.5 2000/05/27 18:24:50 dante Exp $ */ /* @@ -70,7 +70,7 @@ #include <machine/bus.h> #include <machine/intr.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include "adwmcode.h" diff --git a/sys/dev/pci/auvia.c b/sys/dev/pci/auvia.c index 545f63a4480..00eeb4a0518 100644 --- a/sys/dev/pci/auvia.c +++ b/sys/dev/pci/auvia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auvia.c,v 1.11 2001/10/31 11:00:24 art Exp $ */ +/* $OpenBSD: auvia.c,v 1.12 2001/11/06 19:53:19 miod Exp $ */ /* $NetBSD: auvia.c,v 1.7 2000/11/15 21:06:33 jdolecek Exp $ */ /*- @@ -53,7 +53,7 @@ #include <sys/device.h> #include <sys/audioio.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <dev/pci/pcidevs.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c index 473149eae63..5bf2a2e1a09 100644 --- a/sys/dev/pci/bktr/bktr_core.c +++ b/sys/dev/pci/bktr/bktr_core.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_core.c,v 1.2 2001/09/22 19:44:37 mickey Exp $ */ +/* $OpenBSD: bktr_core.c,v 1.3 2001/11/06 19:53:19 miod Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp $ */ /* @@ -197,8 +197,8 @@ typedef unsigned int uintptr_t; #ifdef __NetBSD__ #include <uvm/uvm_extern.h> #else -#include <vm/vm.h> /* for vtophys */ -#include <vm/pmap.h> /* for vtophys */ +#include <uvm/uvm_extern.h> /* for vtophys */ +#include <uvm/uvm_pmap.h> /* for vtophys */ #include <dev/rndvar.h> #endif diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c index ca4507de3fc..09bd14c0ff6 100644 --- a/sys/dev/pci/bktr/bktr_os.c +++ b/sys/dev/pci/bktr/bktr_os.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_os.c,v 1.6 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: bktr_os.c,v 1.7 2001/11/06 19:53:19 miod Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp $ */ /* @@ -148,7 +148,7 @@ SYSCTL_INT(_hw_bt848, OID_AUTO, slow_msp_audio, CTLFLAG_RW, &bt848_slow_msp_audi #include <sys/select.h> #include <sys/vnode.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/device.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/hifn7751.c b/sys/dev/pci/hifn7751.c index fb19508249f..ba3b46a8339 100644 --- a/sys/dev/pci/hifn7751.c +++ b/sys/dev/pci/hifn7751.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hifn7751.c,v 1.105 2001/11/05 17:25:58 art Exp $ */ +/* $OpenBSD: hifn7751.c,v 1.106 2001/11/06 19:53:19 miod Exp $ */ /* * Invertex AEON / Hifn 7751 driver @@ -48,7 +48,7 @@ #include <sys/mbuf.h> #include <sys/device.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <crypto/cryptodev.h> #include <dev/rndvar.h> diff --git a/sys/dev/pci/if_dc_pci.c b/sys/dev/pci/if_dc_pci.c index f315a7eb049..14412d74ab6 100644 --- a/sys/dev/pci/if_dc_pci.c +++ b/sys/dev/pci/if_dc_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_dc_pci.c,v 1.18 2001/10/06 14:37:48 aaron Exp $ */ +/* $OpenBSD: if_dc_pci.c,v 1.19 2001/11/06 19:53:19 miod Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -65,7 +65,7 @@ #include <net/bpf.h> #endif -#include <vm/vm.h> /* for vtophys */ +#include <uvm/uvm_extern.h> /* for vtophys */ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c index 1cfb25ffd1c..b7d8c9a1b7c 100644 --- a/sys/dev/pci/if_de.c +++ b/sys/dev/pci/if_de.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_de.c,v 1.51 2001/09/21 17:55:43 miod Exp $ */ +/* $OpenBSD: if_de.c,v 1.52 2001/11/06 19:53:19 miod Exp $ */ /* $NetBSD: if_de.c,v 1.45 1997/06/09 00:34:18 thorpej Exp $ */ /*- @@ -90,7 +90,7 @@ #include <netns/ns_if.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #if defined(__FreeBSD__) #include <vm/pmap.h> diff --git a/sys/dev/pci/if_fpa.c b/sys/dev/pci/if_fpa.c index b81fe0cb296..421168ccb34 100644 --- a/sys/dev/pci/if_fpa.c +++ b/sys/dev/pci/if_fpa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fpa.c,v 1.16 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: if_fpa.c,v 1.17 2001/11/06 19:53:19 miod Exp $ */ /* $NetBSD: if_fpa.c,v 1.15 1996/10/21 22:56:40 thorpej Exp $ */ /*- @@ -62,7 +62,7 @@ #endif #include <net/if_fddi.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <dev/pci/pcidevs.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/if_fxp_pci.c b/sys/dev/pci/if_fxp_pci.c index fc5abc6d437..191d298121f 100644 --- a/sys/dev/pci/if_fxp_pci.c +++ b/sys/dev/pci/if_fxp_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fxp_pci.c,v 1.10 2001/09/04 23:46:23 provos Exp $ */ +/* $OpenBSD: if_fxp_pci.c,v 1.11 2001/11/06 19:53:19 miod Exp $ */ /* * Copyright (c) 1995, David Greenman @@ -64,7 +64,7 @@ #include <netinet/if_ether.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> #include <machine/bus.h> diff --git a/sys/dev/pci/if_gem_pci.c b/sys/dev/pci/if_gem_pci.c index 096b0abf9d5..870c2d7a1c1 100644 --- a/sys/dev/pci/if_gem_pci.c +++ b/sys/dev/pci/if_gem_pci.c @@ -43,7 +43,6 @@ #include <machine/endian.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <net/if.h> diff --git a/sys/dev/pci/if_le_pci.c b/sys/dev/pci/if_le_pci.c index 3a0ff2a5d3e..2ec2ba0706e 100644 --- a/sys/dev/pci/if_le_pci.c +++ b/sys/dev/pci/if_le_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_pci.c,v 1.17 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: if_le_pci.c,v 1.18 2001/11/06 19:53:19 miod Exp $ */ /* $NetBSD: if_le_pci.c,v 1.13 1996/10/25 21:33:32 cgd Exp $ */ /*- @@ -49,7 +49,7 @@ #include <sys/socket.h> #include <sys/device.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <net/if.h> #include <net/if_media.h> @@ -59,8 +59,6 @@ #include <netinet/if_ether.h> #endif -#include <vm/vm.h> - #include <machine/cpu.h> #include <machine/bus.h> #include <machine/intr.h> diff --git a/sys/dev/pci/if_lge.c b/sys/dev/pci/if_lge.c index aaaf57ab693..b1945b8faf3 100644 --- a/sys/dev/pci/if_lge.c +++ b/sys/dev/pci/if_lge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_lge.c,v 1.5 2001/11/05 16:50:12 todd Exp $ */ +/* $OpenBSD: if_lge.c,v 1.6 2001/11/06 19:53:19 miod Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2000, 2001 @@ -106,8 +106,8 @@ #include <net/bpf.h> #endif -#include <vm/vm.h> /* for vtophys */ -#include <vm/pmap.h> /* for vtophys */ +#include <uvm/uvm_extern.h> /* for vtophys */ +#include <uvm/uvm_pmap.h> /* for vtophys */ #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/if_lmc.c b/sys/dev/pci/if_lmc.c index 2437c071770..845f179bd0c 100644 --- a/sys/dev/pci/if_lmc.c +++ b/sys/dev/pci/if_lmc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_lmc.c,v 1.12 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: if_lmc.c,v 1.13 2001/11/06 19:53:19 miod Exp $ */ /* $NetBSD: if_lmc.c,v 1.1 1999/03/25 03:32:43 explorer Exp $ */ /*- @@ -117,7 +117,7 @@ #include <net/bpfdesc.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) #include <net/if_sppp.h> diff --git a/sys/dev/pci/if_lmc_common.c b/sys/dev/pci/if_lmc_common.c index 62047e40bdb..e5fa81a0944 100644 --- a/sys/dev/pci/if_lmc_common.c +++ b/sys/dev/pci/if_lmc_common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_lmc_common.c,v 1.6 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: if_lmc_common.c,v 1.7 2001/11/06 19:53:19 miod Exp $ */ /* $NetBSD: if_lmc_common.c,v 1.1 1999/03/25 03:32:43 explorer Exp $ */ /*- @@ -101,7 +101,7 @@ #include <net/bpfdesc.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) #include <net/if_sppp.h> diff --git a/sys/dev/pci/if_lmc_media.c b/sys/dev/pci/if_lmc_media.c index 4686264b3ec..fef70e20ed8 100644 --- a/sys/dev/pci/if_lmc_media.c +++ b/sys/dev/pci/if_lmc_media.c @@ -1,5 +1,5 @@ -/* $OpenBSD: if_lmc_media.c,v 1.11 2001/09/11 20:05:25 miod Exp $ */ -/* $Id: if_lmc_media.c,v 1.11 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: if_lmc_media.c,v 1.12 2001/11/06 19:53:19 miod Exp $ */ +/* $Id: if_lmc_media.c,v 1.12 2001/11/06 19:53:19 miod Exp $ */ /*- * Copyright (c) 1997-1999 LAN Media Corporation (LMC) @@ -77,7 +77,7 @@ #include <net/bpfdesc.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) #include <net/if_sppp.h> diff --git a/sys/dev/pci/if_lmc_obsd.c b/sys/dev/pci/if_lmc_obsd.c index e8171b5b14c..78cd2a65a5b 100644 --- a/sys/dev/pci/if_lmc_obsd.c +++ b/sys/dev/pci/if_lmc_obsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_lmc_obsd.c,v 1.11 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: if_lmc_obsd.c,v 1.12 2001/11/06 19:53:19 miod Exp $ */ /* $NetBSD: if_lmc_nbsd.c,v 1.1 1999/03/25 03:32:43 explorer Exp $ */ /*- @@ -101,7 +101,7 @@ #include <net/bpfdesc.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) #include <net/if_sppp.h> diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c index 2f4df88ddea..fa13651a06c 100644 --- a/sys/dev/pci/if_nge.c +++ b/sys/dev/pci/if_nge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nge.c,v 1.13 2001/10/05 01:02:25 nate Exp $ */ +/* $OpenBSD: if_nge.c,v 1.14 2001/11/06 19:53:19 miod Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2000, 2001 @@ -109,7 +109,7 @@ #include <net/bpf.h> #endif -#include <vm/vm.h> /* for vtophys */ +#include <uvm/uvm_extern.h> /* for vtophys */ #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/if_rl_pci.c b/sys/dev/pci/if_rl_pci.c index b4b3cf77028..2cbdc595b58 100644 --- a/sys/dev/pci/if_rl_pci.c +++ b/sys/dev/pci/if_rl_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rl_pci.c,v 1.5 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: if_rl_pci.c,v 1.6 2001/11/06 19:53:19 miod Exp $ */ /* * Copyright (c) 1997, 1998 @@ -62,7 +62,7 @@ #include <net/bpf.h> #endif -#include <vm/vm.h> /* for vtophys */ +#include <uvm/uvm_extern.h> /* for vtophys */ #include <machine/bus.h> #include <dev/mii/mii.h> diff --git a/sys/dev/pci/if_sf.c b/sys/dev/pci/if_sf.c index d8edf500253..6d12c9c22a3 100644 --- a/sys/dev/pci/if_sf.c +++ b/sys/dev/pci/if_sf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sf.c,v 1.14 2001/08/25 10:13:29 art Exp $ */ +/* $OpenBSD: if_sf.c,v 1.15 2001/11/06 19:53:19 miod Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -109,7 +109,7 @@ #include <net/bpf.h> #endif -#include <vm/vm.h> /* for vtophys */ +#include <uvm/uvm_extern.h> /* for vtophys */ #include <sys/device.h> diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c index 16e38b2746d..48650c37bd6 100644 --- a/sys/dev/pci/if_sis.c +++ b/sys/dev/pci/if_sis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sis.c,v 1.18 2001/09/23 22:41:25 aaron Exp $ */ +/* $OpenBSD: if_sis.c,v 1.19 2001/11/06 19:53:19 miod Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -89,7 +89,7 @@ #include <net/bpf.h> #endif -#include <vm/vm.h> /* for vtophys */ +#include <uvm/uvm_extern.h> /* for vtophys */ #include <sys/device.h> diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c index a5b0fa7fd89..554d817c649 100644 --- a/sys/dev/pci/if_sk.c +++ b/sys/dev/pci/if_sk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sk.c,v 1.18 2001/10/05 00:55:40 nate Exp $ */ +/* $OpenBSD: if_sk.c,v 1.19 2001/11/06 19:53:19 miod Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -100,7 +100,7 @@ #include <net/bpf.h> #endif -#include <vm/vm.h> /* for vtophys */ +#include <uvm/uvm_extern.h> /* for vtophys */ #include <machine/bus.h> #include <dev/mii/mii.h> diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c index 6a75bb6d0ad..a43ff81436e 100644 --- a/sys/dev/pci/if_ste.c +++ b/sys/dev/pci/if_ste.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ste.c,v 1.14 2001/08/25 10:13:29 art Exp $ */ +/* $OpenBSD: if_ste.c,v 1.15 2001/11/06 19:53:19 miod Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -64,7 +64,7 @@ #include <net/bpf.h> #endif -#include <vm/vm.h> /* for vtophys */ +#include <uvm/uvm_extern.h> /* for vtophys */ #include <sys/device.h> diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c index 63472502700..a742e12da2f 100644 --- a/sys/dev/pci/if_ti.c +++ b/sys/dev/pci/if_ti.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ti.c,v 1.30 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: if_ti.c,v 1.31 2001/11/06 19:53:19 miod Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -110,7 +110,7 @@ #include <net/bpf.h> #endif -#include <vm/vm.h> /* for vtophys */ +#include <uvm/uvm_extern.h> /* for vtophys */ #include <machine/bus.h> #include <dev/pci/pcireg.h> diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c index 3488e63a09b..b61df4f93d9 100644 --- a/sys/dev/pci/if_tl.c +++ b/sys/dev/pci/if_tl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tl.c,v 1.23 2001/08/25 10:13:29 art Exp $ */ +/* $OpenBSD: if_tl.c,v 1.24 2001/11/06 19:53:19 miod Exp $ */ /* * Copyright (c) 1997, 1998 @@ -209,7 +209,7 @@ #include <net/bpf.h> #endif -#include <vm/vm.h> /* for vtophys */ +#include <uvm/uvm_extern.h> /* for vtophys */ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> diff --git a/sys/dev/pci/if_tx.c b/sys/dev/pci/if_tx.c index 79a537047ec..44b7eec1bfd 100644 --- a/sys/dev/pci/if_tx.c +++ b/sys/dev/pci/if_tx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tx.c,v 1.20 2001/09/20 17:02:31 mpech Exp $ */ +/* $OpenBSD: if_tx.c,v 1.21 2001/11/06 19:53:19 miod Exp $ */ /* $FreeBSD: src/sys/pci/if_tx.c,v 1.45 2001/02/07 20:11:02 semenu Exp $ */ /*- @@ -115,7 +115,7 @@ #include <net/bpf.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <dev/mii/mii.h> #include <dev/mii/miivar.h> diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c index 8a3381fd9c0..361da8354c4 100644 --- a/sys/dev/pci/if_txp.c +++ b/sys/dev/pci/if_txp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_txp.c,v 1.58 2001/11/05 17:25:58 art Exp $ */ +/* $OpenBSD: if_txp.c,v 1.59 2001/11/06 19:53:19 miod Exp $ */ /* * Copyright (c) 2001 @@ -73,7 +73,7 @@ #include <net/if_vlan_var.h> #endif -#include <vm/vm.h> /* for vtophys */ +#include <uvm/uvm_extern.h> /* for vtophys */ #include <machine/bus.h> #include <dev/mii/mii.h> diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index d2c8c26c813..8f086069ce5 100644 --- a/sys/dev/pci/if_vr.c +++ b/sys/dev/pci/if_vr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vr.c,v 1.20 2001/08/25 10:13:29 art Exp $ */ +/* $OpenBSD: if_vr.c,v 1.21 2001/11/06 19:53:19 miod Exp $ */ /* * Copyright (c) 1997, 1998 @@ -87,7 +87,7 @@ #include <net/bpf.h> #endif -#include <vm/vm.h> /* for vtophys */ +#include <uvm/uvm_extern.h> /* for vtophys */ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> diff --git a/sys/dev/pci/if_wb.c b/sys/dev/pci/if_wb.c index 3c5fd8efc50..c6acce95936 100644 --- a/sys/dev/pci/if_wb.c +++ b/sys/dev/pci/if_wb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wb.c,v 1.14 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: if_wb.c,v 1.15 2001/11/06 19:53:19 miod Exp $ */ /* * Copyright (c) 1997, 1998 @@ -116,7 +116,7 @@ #include <net/bpf.h> #endif -#include <vm/vm.h> /* for vtophys */ +#include <uvm/uvm_extern.h> /* for vtophys */ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> diff --git a/sys/dev/pci/if_wxvar.h b/sys/dev/pci/if_wxvar.h index 408552b57fd..da498de7a0d 100644 --- a/sys/dev/pci/if_wxvar.h +++ b/sys/dev/pci/if_wxvar.h @@ -77,7 +77,6 @@ #include <net/bpfdesc.h> #endif -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <machine/bus.h> diff --git a/sys/dev/pci/if_xl_pci.c b/sys/dev/pci/if_xl_pci.c index 7e6de7d158c..f0a28143e70 100644 --- a/sys/dev/pci/if_xl_pci.c +++ b/sys/dev/pci/if_xl_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xl_pci.c,v 1.9 2001/08/25 10:13:29 art Exp $ */ +/* $OpenBSD: if_xl_pci.c,v 1.10 2001/11/06 19:53:19 miod Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -71,7 +71,7 @@ #include <net/bpf.h> #endif -#include <vm/vm.h> /* for vtophys */ +#include <uvm/uvm_extern.h> /* for vtophys */ /* * The following #define causes the code to use PIO to access the diff --git a/sys/dev/pci/lofn.c b/sys/dev/pci/lofn.c index d7f1e9a115d..71d4f8c342d 100644 --- a/sys/dev/pci/lofn.c +++ b/sys/dev/pci/lofn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lofn.c,v 1.10 2001/08/25 10:13:29 art Exp $ */ +/* $OpenBSD: lofn.c,v 1.11 2001/11/06 19:53:19 miod Exp $ */ /* * Copyright (c) 2001 Jason L. Wright (jason@thought.net) @@ -44,7 +44,7 @@ #include <sys/mbuf.h> #include <sys/device.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <crypto/cryptodev.h> #include <dev/rndvar.h> diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c index 56a37e29828..2aa38f908f3 100644 --- a/sys/dev/pci/ncr.c +++ b/sys/dev/pci/ncr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr.c,v 1.61 2001/08/26 00:45:08 fgsch Exp $ */ +/* $OpenBSD: ncr.c,v 1.62 2001/11/06 19:53:19 miod Exp $ */ /* $NetBSD: ncr.c,v 1.63 1997/09/23 02:39:15 perry Exp $ */ /************************************************************************** @@ -225,8 +225,7 @@ #else #include <sys/timeout.h> #endif -#include <vm/vm.h> -#include <vm/vm_extern.h> +#include <uvm/uvm_extern.h> #endif /* KERNEL */ @@ -1467,7 +1466,7 @@ static void ncr_attach (pcici_t tag, int unit); #if 0 static char ident[] = - "\n$OpenBSD: ncr.c,v 1.61 2001/08/26 00:45:08 fgsch Exp $\n"; + "\n$OpenBSD: ncr.c,v 1.62 2001/11/06 19:53:19 miod Exp $\n"; #endif static const u_long ncr_version = NCR_VERSION * 11 diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c index 095dde889c8..abac1197280 100644 --- a/sys/dev/pci/pciide.c +++ b/sys/dev/pci/pciide.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide.c,v 1.72 2001/11/05 17:25:58 art Exp $ */ +/* $OpenBSD: pciide.c,v 1.73 2001/11/06 19:53:19 miod Exp $ */ /* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */ /* @@ -92,7 +92,7 @@ int wdcdebug_pciide_mask = 0; #include <sys/device.h> #include <sys/malloc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/endian.h> diff --git a/sys/dev/pci/tga.c b/sys/dev/pci/tga.c index e5addd7b0b6..c050c47632a 100644 --- a/sys/dev/pci/tga.c +++ b/sys/dev/pci/tga.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tga.c,v 1.9 2001/09/16 00:42:44 millert Exp $ */ +/* $OpenBSD: tga.c,v 1.10 2001/11/06 19:53:19 miod Exp $ */ /* $NetBSD: tga.c,v 1.31 2001/02/11 19:34:58 nathanw Exp $ */ /* @@ -55,7 +55,6 @@ #include <dev/rasops/rasops.h> #include <dev/wsfont/wsfont.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #ifdef __alpha__ diff --git a/sys/dev/pci/ubsec.c b/sys/dev/pci/ubsec.c index c2a0be5d7fc..7d2aa87be86 100644 --- a/sys/dev/pci/ubsec.c +++ b/sys/dev/pci/ubsec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubsec.c,v 1.71 2001/11/05 17:25:58 art Exp $ */ +/* $OpenBSD: ubsec.c,v 1.72 2001/11/06 19:53:19 miod Exp $ */ /* * Copyright (c) 2000 Jason L. Wright (jason@thought.net) @@ -49,7 +49,7 @@ #include <sys/device.h> #include <sys/queue.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <crypto/cryptodev.h> #include <crypto/cryptosoft.h> diff --git a/sys/dev/pcmcia/wdc_pcmcia.c b/sys/dev/pcmcia/wdc_pcmcia.c index 8f69365e839..396cf458f9f 100644 --- a/sys/dev/pcmcia/wdc_pcmcia.c +++ b/sys/dev/pcmcia/wdc_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdc_pcmcia.c,v 1.12 2001/08/17 21:52:16 deraadt Exp $ */ +/* $OpenBSD: wdc_pcmcia.c,v 1.13 2001/11/06 19:53:19 miod Exp $ */ /* $NetBSD: wdc_pcmcia.c,v 1.19 1999/02/19 21:49:43 abs Exp $ */ /*- @@ -53,7 +53,7 @@ #include <sys/syslog.h> #include <sys/proc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> #include <machine/intr.h> diff --git a/sys/dev/ramdisk.c b/sys/dev/ramdisk.c index 40bb2b61d68..420ba076022 100644 --- a/sys/dev/ramdisk.c +++ b/sys/dev/ramdisk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ramdisk.c,v 1.16 2001/10/24 19:11:08 millert Exp $ */ +/* $OpenBSD: ramdisk.c,v 1.17 2001/11/06 19:53:18 miod Exp $ */ /* $NetBSD: ramdisk.c,v 1.8 1996/04/12 08:30:09 leo Exp $ */ /* @@ -59,7 +59,6 @@ #include <sys/disklabel.h> #include <sys/dkio.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <dev/ramdisk.h> diff --git a/sys/dev/tc/if_fta.c b/sys/dev/tc/if_fta.c index 2d36bc5560f..6265638b391 100644 --- a/sys/dev/tc/if_fta.c +++ b/sys/dev/tc/if_fta.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fta.c,v 1.8 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: if_fta.c,v 1.9 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: if_fta.c,v 1.7 1996/10/22 21:37:26 cgd Exp $ */ /*- @@ -56,7 +56,7 @@ #endif #include <net/if_fddi.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <dev/tc/tcvar.h> #include <dev/ic/pdqvar.h> diff --git a/sys/dev/tc/if_le_ioasic.c b/sys/dev/tc/if_le_ioasic.c index 9bc5f56deb8..555e758553d 100644 --- a/sys/dev/tc/if_le_ioasic.c +++ b/sys/dev/tc/if_le_ioasic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_ioasic.c,v 1.6 2001/06/27 04:45:59 art Exp $ */ +/* $OpenBSD: if_le_ioasic.c,v 1.7 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: if_le_ioasic.c,v 1.2 1996/05/07 02:24:56 thorpej Exp $ */ /* @@ -42,7 +42,6 @@ #include <net/if.h> #include <net/if_media.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #ifdef INET diff --git a/sys/kern/exec_aout.c b/sys/kern/exec_aout.c index f955081ae2b..202ee8f3af8 100644 --- a/sys/kern/exec_aout.c +++ b/sys/kern/exec_aout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_aout.c,v 1.5 1999/09/10 22:11:49 art Exp $ */ +/* $OpenBSD: exec_aout.c,v 1.6 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: exec_aout.c,v 1.14 1996/02/04 02:15:01 christos Exp $ */ /* @@ -38,7 +38,7 @@ #include <sys/vnode.h> #include <sys/exec.h> #include <sys/resourcevar.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #if defined(_KERN_DO_AOUT) diff --git a/sys/kern/exec_ecoff.c b/sys/kern/exec_ecoff.c index 8a9260b2e74..5e0d343adff 100644 --- a/sys/kern/exec_ecoff.c +++ b/sys/kern/exec_ecoff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_ecoff.c,v 1.7 2001/06/22 14:14:07 deraadt Exp $ */ +/* $OpenBSD: exec_ecoff.c,v 1.8 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: exec_ecoff.c,v 1.8 1996/05/19 20:36:06 jonathan Exp $ */ /* @@ -39,7 +39,7 @@ #include <sys/vnode.h> #include <sys/exec.h> #include <sys/resourcevar.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #if defined(_KERN_DO_ECOFF) diff --git a/sys/kern/exec_elf.c b/sys/kern/exec_elf.c index 8a879c45253..889b150ce29 100644 --- a/sys/kern/exec_elf.c +++ b/sys/kern/exec_elf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_elf.c,v 1.35 2001/09/19 13:28:43 art Exp $ */ +/* $OpenBSD: exec_elf.c,v 1.36 2001/11/06 19:53:20 miod Exp $ */ /* * Copyright (c) 1996 Per Fogelstrom @@ -48,7 +48,7 @@ #include <sys/stat.h> #include <sys/mman.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> #include <machine/reg.h> diff --git a/sys/kern/exec_script.c b/sys/kern/exec_script.c index ee852e32222..7f8dc558f2a 100644 --- a/sys/kern/exec_script.c +++ b/sys/kern/exec_script.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_script.c,v 1.14 2001/10/26 12:03:27 art Exp $ */ +/* $OpenBSD: exec_script.c,v 1.15 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: exec_script.c,v 1.13 1996/02/04 02:15:06 christos Exp $ */ /* @@ -41,7 +41,7 @@ #include <sys/filedesc.h> #include <sys/exec.h> #include <sys/resourcevar.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/exec_script.h> diff --git a/sys/kern/exec_subr.c b/sys/kern/exec_subr.c index ce252a8cc15..54247d51ac7 100644 --- a/sys/kern/exec_subr.c +++ b/sys/kern/exec_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_subr.c,v 1.12 2001/06/27 04:49:40 art Exp $ */ +/* $OpenBSD: exec_subr.c,v 1.13 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: exec_subr.c,v 1.9 1994/12/04 03:10:42 mycroft Exp $ */ /* @@ -41,8 +41,6 @@ #include <sys/mman.h> #include <sys/resourcevar.h> -#include <vm/vm.h> - #include <uvm/uvm.h> #ifdef DEBUG diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 4d7f4265c74..25c2c8d4bb5 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init_main.c,v 1.81 2001/11/06 18:41:10 art Exp $ */ +/* $OpenBSD: init_main.c,v 1.82 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */ /* @@ -84,8 +84,6 @@ #include <machine/cpu.h> -#include <vm/vm.h> - #include <uvm/uvm.h> #include <net/if.h> diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 3e3c0b7efc3..b120e6a8b6b 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_clock.c,v 1.28 2001/08/19 06:10:09 art Exp $ */ +/* $OpenBSD: kern_clock.c,v 1.29 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: kern_clock.c,v 1.34 1996/06/09 04:51:03 briggs Exp $ */ /*- @@ -49,7 +49,7 @@ #include <sys/proc.h> #include <sys/resourcevar.h> #include <sys/signalvar.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/sysctl.h> #include <sys/timex.h> #include <sys/sched.h> diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index bc84186b4ca..4e4d9f655cc 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_descrip.c,v 1.41 2001/11/05 02:03:58 art Exp $ */ +/* $OpenBSD: kern_descrip.c,v 1.42 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: kern_descrip.c,v 1.42 1996/03/30 22:24:38 christos Exp $ */ /* @@ -64,7 +64,7 @@ #include <sys/event.h> #include <sys/pool.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/pipe.h> diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index ca619f10f2a..846af9b8fe7 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_exec.c,v 1.58 2001/10/26 12:03:27 art Exp $ */ +/* $OpenBSD: kern_exec.c,v 1.59 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: kern_exec.c,v 1.75 1996/02/09 18:59:28 christos Exp $ */ /*- @@ -58,7 +58,6 @@ #include <sys/syscallargs.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <machine/cpu.h> diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index c68702d3d45..37c7da7480e 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_exit.c,v 1.35 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: kern_exit.c,v 1.36 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: kern_exit.c,v 1.39 1996/04/22 01:38:25 christos Exp $ */ /* @@ -77,8 +77,6 @@ #include <machine/cpu.h> -#include <vm/vm.h> - #include <uvm/uvm_extern.h> void proc_zap __P((struct proc *)); diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index e3db4cdc4d5..9cc881f6b5e 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_fork.c,v 1.46 2001/11/06 18:41:10 art Exp $ */ +/* $OpenBSD: kern_fork.c,v 1.47 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: kern_fork.c,v 1.29 1996/02/09 18:59:34 christos Exp $ */ /* @@ -62,7 +62,6 @@ #include <sys/syscallargs.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <uvm/uvm_map.h> diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c index 55788dd59a7..456fc6c9316 100644 --- a/sys/kern/kern_ktrace.c +++ b/sys/kern/kern_ktrace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_ktrace.c,v 1.24 2001/06/26 06:27:38 aaron Exp $ */ +/* $OpenBSD: kern_ktrace.c,v 1.25 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: kern_ktrace.c,v 1.23 1996/02/09 18:59:36 christos Exp $ */ /* @@ -51,7 +51,7 @@ #include <sys/mount.h> #include <sys/syscallargs.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> void ktrinitheader __P((struct ktr_header *, struct proc *, int)); int ktrops __P((struct proc *, struct proc *, int, int, struct vnode *)); diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c index 0bf07fdc3fa..7bbf892743b 100644 --- a/sys/kern/kern_lkm.c +++ b/sys/kern/kern_lkm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_lkm.c,v 1.33 2001/09/19 20:50:58 mickey Exp $ */ +/* $OpenBSD: kern_lkm.c,v 1.34 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: kern_lkm.c,v 1.31 1996/03/31 21:40:27 christos Exp $ */ /* @@ -59,7 +59,6 @@ #include <sys/lkm.h> #include <sys/syscall.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #ifdef DDB diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 96b81397dce..69354571140 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_malloc.c,v 1.39 2001/09/19 20:50:58 mickey Exp $ */ +/* $OpenBSD: kern_malloc.c,v 1.40 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $ */ /* @@ -44,7 +44,6 @@ #include <sys/systm.h> #include <sys/sysctl.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> static struct vm_map_intrsafe kmem_map_store; diff --git a/sys/kern/kern_malloc_debug.c b/sys/kern/kern_malloc_debug.c index ac88d6725b5..dab61b5ac40 100644 --- a/sys/kern/kern_malloc_debug.c +++ b/sys/kern/kern_malloc_debug.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_malloc_debug.c,v 1.13 2001/09/19 20:50:58 mickey Exp $ */ +/* $OpenBSD: kern_malloc_debug.c,v 1.14 2001/11/06 19:53:20 miod Exp $ */ /* * Copyright (c) 1999, 2000 Artur Grabowski <art@openbsd.org> @@ -60,7 +60,6 @@ #include <sys/systm.h> #include <sys/pool.h> -#include <vm/vm.h> #include <uvm/uvm.h> /* diff --git a/sys/kern/kern_ntptime.c b/sys/kern/kern_ntptime.c index 896e6aa80fb..bf8ba50fb94 100644 --- a/sys/kern/kern_ntptime.c +++ b/sys/kern/kern_ntptime.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_ntptime.c,v 1.10 2001/07/04 23:00:58 espie Exp $ */ +/* $OpenBSD: kern_ntptime.c,v 1.11 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: kern_ntptime.c,v 1.2 1996/03/07 14:31:20 christos Exp $ */ /****************************************************************************** @@ -62,7 +62,7 @@ #include <machine/cpu.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/sysctl.h> #ifdef NTP diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c index a684e74201f..b9836263fc4 100644 --- a/sys/kern/kern_physio.c +++ b/sys/kern/kern_physio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_physio.c,v 1.13 2001/06/27 04:49:44 art Exp $ */ +/* $OpenBSD: kern_physio.c,v 1.14 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: kern_physio.c,v 1.28 1997/05/19 10:43:28 pk Exp $ */ /*- @@ -49,8 +49,6 @@ #include <sys/proc.h> #include <sys/malloc.h> -#include <vm/vm.h> - #include <uvm/uvm_extern.h> /* diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index b800439ab38..668c38f28be 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_resource.c,v 1.14 2001/06/27 04:49:44 art Exp $ */ +/* $OpenBSD: kern_resource.c,v 1.15 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: kern_resource.c,v 1.38 1996/10/23 07:19:38 matthias Exp $ */ /*- @@ -52,8 +52,6 @@ #include <sys/mount.h> #include <sys/syscallargs.h> -#include <vm/vm.h> - #include <uvm/uvm_extern.h> /* diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 33749d3d38b..ce90734b25a 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sig.c,v 1.49 2001/09/21 21:36:48 deraadt Exp $ */ +/* $OpenBSD: kern_sig.c,v 1.50 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: kern_sig.c,v 1.54 1996/04/22 01:38:32 christos Exp $ */ /* @@ -72,10 +72,8 @@ #include <machine/cpu.h> -#include <vm/vm.h> -#include <sys/user.h> /* for coredump */ - #include <uvm/uvm_extern.h> +#include <sys/user.h> /* for coredump */ int filt_sigattach(struct knote *kn); void filt_sigdetach(struct knote *kn); diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 0441d05b95b..57c9e4c6b2e 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_synch.c,v 1.38 2001/09/13 14:41:50 art Exp $ */ +/* $OpenBSD: kern_synch.c,v 1.39 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: kern_synch.c,v 1.37 1996/04/22 01:38:37 christos Exp $ */ /*- @@ -48,12 +48,10 @@ #include <sys/buf.h> #include <sys/signalvar.h> #include <sys/resourcevar.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/sched.h> #include <sys/timeout.h> -#include <uvm/uvm_extern.h> - #ifdef KTRACE #include <sys/ktrace.h> #endif diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index a316e271f56..4c4a911d690 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sysctl.c,v 1.58 2001/09/28 01:42:54 millert Exp $ */ +/* $OpenBSD: kern_sysctl.c,v 1.59 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */ /*- @@ -57,15 +57,13 @@ #include <sys/tty.h> #include <sys/disklabel.h> #include <sys/disk.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/sysctl.h> #include <sys/msgbuf.h> #include <sys/dkstat.h> #include <sys/vmmeter.h> #include <sys/namei.h> -#include <uvm/uvm_extern.h> - #include <sys/mount.h> #include <sys/syscallargs.h> #include <dev/rndvar.h> diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c index d3e88367c7f..86916a64e2f 100644 --- a/sys/kern/kern_xxx.c +++ b/sys/kern/kern_xxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_xxx.c,v 1.4 1996/08/26 09:16:01 deraadt Exp $ */ +/* $OpenBSD: kern_xxx.c,v 1.5 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: kern_xxx.c,v 1.32 1996/04/22 01:38:41 christos Exp $ */ /* @@ -41,7 +41,7 @@ #include <sys/kernel.h> #include <sys/proc.h> #include <sys/reboot.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/sysctl.h> #include <sys/mount.h> #include <sys/syscallargs.h> diff --git a/sys/kern/subr_pool.c b/sys/kern/subr_pool.c index d196084ea80..fa985f0e10c 100644 --- a/sys/kern/subr_pool.c +++ b/sys/kern/subr_pool.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_pool.c,v 1.13 2001/09/19 20:50:58 mickey Exp $ */ +/* $OpenBSD: subr_pool.c,v 1.14 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: subr_pool.c,v 1.59 2001/06/05 18:51:04 thorpej Exp $ */ /*- @@ -49,7 +49,6 @@ #include <sys/syslog.h> #include <sys/sysctl.h> -#include <vm/vm.h> #include <uvm/uvm.h> /* diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c index d9772d607f0..a18c39c2df1 100644 --- a/sys/kern/subr_prof.c +++ b/sys/kern/subr_prof.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_prof.c,v 1.8 2001/09/19 20:50:59 mickey Exp $ */ +/* $OpenBSD: subr_prof.c,v 1.9 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: subr_prof.c,v 1.12 1996/04/22 01:38:50 christos Exp $ */ /*- @@ -49,7 +49,6 @@ #ifdef GPROF #include <sys/malloc.h> #include <sys/gmon.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> /* diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 48290fb70dd..39bc68dfc84 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_pipe.c,v 1.39 2001/10/26 12:03:27 art Exp $ */ +/* $OpenBSD: sys_pipe.c,v 1.40 2001/11/06 19:53:20 miod Exp $ */ /* * Copyright (c) 1996 John S. Dyson @@ -47,7 +47,6 @@ #include <sys/event.h> #include <sys/lock.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <sys/pipe.h> diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 084bce95af1..31f9b475e51 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_process.c,v 1.13 2001/06/27 04:49:47 art Exp $ */ +/* $OpenBSD: sys_process.c,v 1.14 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: sys_process.c,v 1.55 1996/05/15 06:17:47 tls Exp $ */ /*- @@ -65,7 +65,6 @@ #include <sys/mount.h> #include <sys/syscallargs.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> #include <machine/reg.h> diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index 7902a10549a..c63455509ba 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysv_shm.c,v 1.20 2001/08/12 22:50:12 millert Exp $ */ +/* $OpenBSD: sysv_shm.c,v 1.21 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: sysv_shm.c,v 1.50 1998/10/21 22:24:29 tron Exp $ */ /* @@ -46,7 +46,6 @@ #include <sys/mount.h> #include <sys/syscallargs.h> -#include <vm/vm.h> #include <uvm/uvm_extern.h> struct shminfo shminfo; diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 4c60990ed1e..62c3451121d 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.c,v 1.47 2001/10/07 22:27:01 art Exp $ */ +/* $OpenBSD: tty.c,v 1.48 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: tty.c,v 1.68.4.2 1996/06/06 16:04:52 thorpej Exp $ */ /*- @@ -62,7 +62,7 @@ #include <sys/namei.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <dev/rndvar.h> static int ttnread __P((struct tty *)); diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index d2394908b6f..aff438d6597 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_domain.c,v 1.11 2000/09/12 16:39:14 deraadt Exp $ */ +/* $OpenBSD: uipc_domain.c,v 1.12 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: uipc_domain.c,v 1.14 1996/02/09 19:00:44 christos Exp $ */ /* @@ -45,7 +45,7 @@ #include <sys/kernel.h> #include <sys/systm.h> #include <sys/proc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/sysctl.h> #include <sys/timeout.h> diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index a5f473ddbb1..2553a1661cd 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_mbuf.c,v 1.41 2001/09/12 00:23:33 art Exp $ */ +/* $OpenBSD: uipc_mbuf.c,v 1.42 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $ */ /* @@ -63,8 +63,6 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>. #include <machine/cpu.h> -#include <vm/vm.h> - #include <uvm/uvm_extern.h> struct pool mbpool; /* mbuf pool */ diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index e724172f51e..7c5eba3914c 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_bio.c,v 1.47 2001/10/28 19:19:00 deraadt Exp $ */ +/* $OpenBSD: vfs_bio.c,v 1.48 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: vfs_bio.c,v 1.44 1996/06/11 11:15:36 pk Exp $ */ /*- @@ -60,7 +60,7 @@ #include <sys/conf.h> #include <sys/kernel.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <miscfs/specfs/specdev.h> diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index 9de90d5920f..88ac3faf875 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_cluster.c,v 1.25 2001/06/22 14:14:10 deraadt Exp $ */ +/* $OpenBSD: vfs_cluster.c,v 1.26 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: vfs_cluster.c,v 1.12 1996/04/22 01:39:05 christos Exp $ */ /*- @@ -45,7 +45,7 @@ #include <sys/systm.h> #include <sys/resourcevar.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> /* * Local declarations diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 588d6988b1e..68ce8bd211a 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_subr.c,v 1.68 2001/10/02 17:21:02 csapuntz Exp $ */ +/* $OpenBSD: vfs_subr.c,v 1.69 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */ /* @@ -64,13 +64,11 @@ #include <sys/syscallargs.h> #include <sys/pool.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/sysctl.h> #include <miscfs/specfs/specdev.h> -#include <uvm/uvm_extern.h> - enum vtype iftovt_tab[16] = { VNON, VFIFO, VCHR, VNON, VDIR, VNON, VBLK, VNON, VREG, VNON, VLNK, VNON, VSOCK, VNON, VNON, VBAD, diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 36f606fe474..284fad0fbda 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_syscalls.c,v 1.81 2001/10/26 12:03:27 art Exp $ */ +/* $OpenBSD: vfs_syscalls.c,v 1.82 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: vfs_syscalls.c,v 1.71 1996/04/23 10:29:02 mycroft Exp $ */ /* @@ -57,10 +57,8 @@ #include <sys/syscallargs.h> -#include <vm/vm.h> -#include <sys/sysctl.h> - #include <uvm/uvm_extern.h> +#include <sys/sysctl.h> extern int suid_clear; int usermount = 0; /* sysctl: by default, users may not mount */ diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 6db663d3eaf..a6a4971a36b 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_vnops.c,v 1.33 2001/07/16 18:25:43 millert Exp $ */ +/* $OpenBSD: vfs_vnops.c,v 1.34 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: vfs_vnops.c,v 1.20 1996/02/04 02:18:41 christos Exp $ */ /* @@ -55,8 +55,6 @@ #include <sys/tty.h> #include <sys/cdio.h> -#include <vm/vm.h> - #include <uvm/uvm_extern.h> int vn_read __P((struct file *fp, off_t *off, struct uio *uio, 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 diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c index de568c62c90..eb82f75afe3 100644 --- a/sys/msdosfs/msdosfs_denode.c +++ b/sys/msdosfs/msdosfs_denode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfs_denode.c,v 1.18 2001/06/27 04:58:45 art Exp $ */ +/* $OpenBSD: msdosfs_denode.c,v 1.19 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: msdosfs_denode.c,v 1.23 1997/10/17 11:23:58 ws Exp $ */ /*- @@ -59,7 +59,7 @@ #include <sys/dirent.h> #include <sys/namei.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <msdosfs/bpb.h> #include <msdosfs/msdosfsmount.h> diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c index 1b6dd49c85d..7f1ab384295 100644 --- a/sys/msdosfs/msdosfs_vnops.c +++ b/sys/msdosfs/msdosfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfs_vnops.c,v 1.27 2001/08/23 13:52:35 aaron Exp $ */ +/* $OpenBSD: msdosfs_vnops.c,v 1.28 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.63 1997/10/17 11:24:19 ws Exp $ */ /*- @@ -65,7 +65,7 @@ #include <sys/dirent.h> /* defines dirent structure */ #include <sys/lockf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <msdosfs/bpb.h> #include <msdosfs/direntry.h> diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index bba0a96da0d..c58b7225ce7 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtsock.c,v 1.17 2001/09/20 17:02:31 mpech Exp $ */ +/* $OpenBSD: rtsock.c,v 1.18 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: rtsock.c,v 1.18 1996/03/29 00:32:10 cgd Exp $ */ /* @@ -74,7 +74,7 @@ #include <sys/domain.h> #include <sys/protosw.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/sysctl.h> #include <net/if.h> diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 1169dc1474d..a1ad12b3e5f 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ether.c,v 1.33 2001/07/08 12:31:12 niklas Exp $ */ +/* $OpenBSD: if_ether.c,v 1.34 2001/11/06 19:53:20 miod Exp $ */ /* $NetBSD: if_ether.c,v 1.31 1996/05/11 12:59:58 mycroft Exp $ */ /* @@ -95,7 +95,7 @@ static int revarp_in_progress = 0; struct ifnet *myip_ifp = NULL; #ifdef DDB -#include <vm/vm.h> +#include <uvm/uvm_extern.h> void db_print_sa __P((struct sockaddr *)); void db_print_ifa __P((struct ifaddr *)); diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 4d94d183eaa..019f1315100 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: icmp6.c,v 1.47 2001/06/27 03:49:54 angelos Exp $ */ +/* $OpenBSD: icmp6.c,v 1.48 2001/11/06 19:53:20 miod Exp $ */ /* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */ /* @@ -2898,7 +2898,7 @@ icmp6_redirect_timeout(rt, r) } } -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/sysctl.h> int icmp6_sysctl(name, namelen, oldp, oldlenp, newp, newlen) diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 381b5a088f7..e2a54b387f7 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_input.c,v 1.34 2001/11/02 09:01:29 itojun Exp $ */ +/* $OpenBSD: ip6_input.c,v 1.35 2001/11/06 19:53:21 miod Exp $ */ /* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -1421,7 +1421,7 @@ u_char inet6ctlerrmap[PRC_NCMDS] = { ENOPROTOOPT }; -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/sysctl.h> int diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c index 0cc0b3bcc6f..4f5e6622d1e 100644 --- a/sys/netipx/ipx_usrreq.c +++ b/sys/netipx/ipx_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipx_usrreq.c,v 1.9 2001/09/23 10:22:13 mickey Exp $ */ +/* $OpenBSD: ipx_usrreq.c,v 1.10 2001/11/06 19:53:21 miod Exp $ */ /*- * @@ -52,7 +52,7 @@ #include <sys/errno.h> #include <sys/stat.h> #include <sys/proc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/sysctl.h> #include <net/if.h> diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c index 20ce213fb5a..71f59eced14 100644 --- a/sys/nfs/nfs_bio.c +++ b/sys/nfs/nfs_bio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_bio.c,v 1.22 2001/06/27 04:58:46 art Exp $ */ +/* $OpenBSD: nfs_bio.c,v 1.23 2001/11/06 19:53:21 miod Exp $ */ /* $NetBSD: nfs_bio.c,v 1.25.4.2 1996/07/08 20:47:04 jtc Exp $ */ /* @@ -51,7 +51,7 @@ #include <sys/kernel.h> #include <sys/namei.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <nfs/rpcv2.h> #include <nfs/nfsproto.h> diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c index 0fadf687f7b..9d4de9fd9a1 100644 --- a/sys/nfs/nfs_serv.c +++ b/sys/nfs/nfs_serv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_serv.c,v 1.26 2001/07/26 20:24:47 millert Exp $ */ +/* $OpenBSD: nfs_serv.c,v 1.27 2001/11/06 19:53:21 miod Exp $ */ /* $NetBSD: nfs_serv.c,v 1.34 1997/05/12 23:37:12 fvdl Exp $ */ /* @@ -74,7 +74,7 @@ #include <sys/kernel.h> #include <ufs/ufs/dir.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <nfs/nfsproto.h> #include <nfs/rpcv2.h> diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index 64601c0dbd0..9689d9f36a5 100644 --- a/sys/nfs/nfs_subs.c +++ b/sys/nfs/nfs_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_subs.c,v 1.34 2001/08/19 18:14:54 art Exp $ */ +/* $OpenBSD: nfs_subs.c,v 1.35 2001/11/06 19:53:21 miod Exp $ */ /* $NetBSD: nfs_subs.c,v 1.27.4.3 1996/07/08 20:34:24 jtc Exp $ */ /* @@ -59,7 +59,7 @@ #include <sys/malloc.h> #include <sys/time.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <nfs/rpcv2.h> #include <nfs/nfsproto.h> @@ -73,8 +73,6 @@ #include <miscfs/specfs/specdev.h> -#include <vm/vm.h> - #include <netinet/in.h> #ifdef ISO #include <netiso/iso.h> diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index f189a448a73..72bb4661e11 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_vnops.c,v 1.37 2001/07/26 20:24:47 millert Exp $ */ +/* $OpenBSD: nfs_vnops.c,v 1.38 2001/11/06 19:53:21 miod Exp $ */ /* $NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $ */ /* @@ -61,7 +61,7 @@ #include <sys/fcntl.h> #include <sys/lockf.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <miscfs/specfs/specdev.h> #include <miscfs/fifofs/fifo.h> diff --git a/sys/sys/pipe.h b/sys/sys/pipe.h index 2aec76962cb..7cca9ad4140 100644 --- a/sys/sys/pipe.h +++ b/sys/sys/pipe.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pipe.h,v 1.8 2001/06/23 06:09:16 art Exp $ */ +/* $OpenBSD: pipe.h,v 1.9 2001/11/06 19:53:21 miod Exp $ */ /* * Copyright (c) 1996 John S. Dyson @@ -27,7 +27,7 @@ #ifndef _KERNEL #include <sys/time.h> /* for struct timeval */ #include <sys/select.h> /* for struct selinfo */ -#include <vm/vm.h> /* for vm_page_t */ +#include <uvm/uvm_extern.h> /* for vm_page_t */ #include <machine/param.h> /* for PAGE_SIZE */ #endif /* _KERNEL */ diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index fa056a7bd1a..edbfbe6afca 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sysctl.h,v 1.43 2001/09/28 01:42:54 millert Exp $ */ +/* $OpenBSD: sysctl.h,v 1.44 2001/11/06 19:53:21 miod Exp $ */ /* $NetBSD: sysctl.h,v 1.16 1996/04/09 20:55:36 cgd Exp $ */ /* @@ -51,7 +51,7 @@ #include <sys/proc.h> #endif -#include <vm/vm.h> +#include <uvm/uvm_extern.h> /* * Definitions for sysctl call. The sysctl call uses a hierarchical name diff --git a/sys/sys/user.h b/sys/sys/user.h index 45eb714501f..891ad4e888e 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -1,4 +1,4 @@ -/* $OpenBSD: user.h,v 1.4 2001/04/02 21:43:12 niklas Exp $ */ +/* $OpenBSD: user.h,v 1.5 2001/11/06 19:53:21 miod Exp $ */ /* $NetBSD: user.h,v 1.10 1996/04/09 20:55:49 cgd Exp $ */ /* @@ -46,7 +46,7 @@ #include <sys/uio.h> #endif #include <sys/resourcevar.h> -#include <vm/vm.h> /* XXX */ +#include <uvm/uvm_extern.h> /* XXX */ #include <sys/sysctl.h> diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index fe721f93175..9205aabd9f1 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vnode.h,v 1.39 2001/08/12 17:55:57 mickey Exp $ */ +/* $OpenBSD: vnode.h,v 1.40 2001/11/06 19:53:21 miod Exp $ */ /* $NetBSD: vnode.h,v 1.38 1996/02/29 20:59:05 cgd Exp $ */ /* @@ -44,10 +44,7 @@ /* XXX: clean up includes later */ #include <uvm/uvm_pglist.h> /* XXX */ #include <sys/lock.h> /* XXX */ -#include <vm/vm.h> /* XXX */ #include <uvm/uvm.h> /* XXX */ -#include <uvm/uvm_extern.h> /* XXX */ -#include <uvm/uvm_object.h> /* XXX */ #include <uvm/uvm_vnode.h> /* XXX */ /* diff --git a/sys/ufs/ext2fs/ext2fs_balloc.c b/sys/ufs/ext2fs/ext2fs_balloc.c index 3696f565f6d..849a8864b2a 100644 --- a/sys/ufs/ext2fs/ext2fs_balloc.c +++ b/sys/ufs/ext2fs/ext2fs_balloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_balloc.c,v 1.6 2001/09/17 23:31:39 art Exp $ */ +/* $OpenBSD: ext2fs_balloc.c,v 1.7 2001/11/06 19:53:21 miod Exp $ */ /* $NetBSD: ext2fs_balloc.c,v 1.10 2001/07/04 21:16:01 chs Exp $ */ /* @@ -45,7 +45,7 @@ #include <sys/file.h> #include <sys/vnode.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <ufs/ufs/quota.h> #include <ufs/ufs/inode.h> diff --git a/sys/ufs/ext2fs/ext2fs_inode.c b/sys/ufs/ext2fs/ext2fs_inode.c index 5ab85490daf..4af28d9bf0e 100644 --- a/sys/ufs/ext2fs/ext2fs_inode.c +++ b/sys/ufs/ext2fs/ext2fs_inode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_inode.c,v 1.16 2001/09/18 01:46:40 art Exp $ */ +/* $OpenBSD: ext2fs_inode.c,v 1.17 2001/11/06 19:53:21 miod Exp $ */ /* $NetBSD: ext2fs_inode.c,v 1.24 2001/06/19 12:59:18 wiz Exp $ */ /* @@ -49,7 +49,7 @@ #include <sys/malloc.h> #include <sys/resourcevar.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <ufs/ufs/quota.h> #include <ufs/ufs/inode.h> diff --git a/sys/ufs/ext2fs/ext2fs_vnops.c b/sys/ufs/ext2fs/ext2fs_vnops.c index b34882e4ead..0faba75ffd2 100644 --- a/sys/ufs/ext2fs/ext2fs_vnops.c +++ b/sys/ufs/ext2fs/ext2fs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_vnops.c,v 1.16 2001/07/26 20:24:47 millert Exp $ */ +/* $OpenBSD: ext2fs_vnops.c,v 1.17 2001/11/06 19:53:21 miod Exp $ */ /* $NetBSD: ext2fs_vnops.c,v 1.1 1997/06/11 09:34:09 bouyer Exp $ */ /* @@ -60,8 +60,6 @@ #include <sys/pool.h> #include <sys/signalvar.h> -#include <vm/vm.h> - #include <uvm/uvm_extern.h> #include <miscfs/fifofs/fifo.h> diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 66640da3361..f3035539de3 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_alloc.c,v 1.31 2001/10/09 23:12:19 csapuntz Exp $ */ +/* $OpenBSD: ffs_alloc.c,v 1.32 2001/11/06 19:53:21 miod Exp $ */ /* $NetBSD: ffs_alloc.c,v 1.11 1996/05/11 18:27:09 mycroft Exp $ */ /* @@ -45,7 +45,7 @@ #include <sys/kernel.h> #include <sys/syslog.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <dev/rndvar.h> diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c index ca1389b7079..87554518aa5 100644 --- a/sys/ufs/ffs/ffs_balloc.c +++ b/sys/ufs/ffs/ffs_balloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_balloc.c,v 1.14 2001/06/27 04:58:48 art Exp $ */ +/* $OpenBSD: ffs_balloc.c,v 1.15 2001/11/06 19:53:21 miod Exp $ */ /* $NetBSD: ffs_balloc.c,v 1.3 1996/02/09 22:22:21 christos Exp $ */ /* @@ -44,8 +44,6 @@ #include <sys/mount.h> #include <sys/vnode.h> -#include <vm/vm.h> - #include <uvm/uvm_extern.h> #include <ufs/ufs/quota.h> diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c index 4ffd5f38cc3..3c024a15fa8 100644 --- a/sys/ufs/ffs/ffs_inode.c +++ b/sys/ufs/ffs/ffs_inode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_inode.c,v 1.23 2001/07/16 03:44:23 csapuntz Exp $ */ +/* $OpenBSD: ffs_inode.c,v 1.24 2001/11/06 19:53:21 miod Exp $ */ /* $NetBSD: ffs_inode.c,v 1.10 1996/05/11 18:27:19 mycroft Exp $ */ /* @@ -47,8 +47,6 @@ #include <sys/malloc.h> #include <sys/resourcevar.h> -#include <vm/vm.h> - #include <uvm/uvm_extern.h> #include <ufs/ufs/quota.h> diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index 1f1a648007d..a409e6dd41a 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_softdep.c,v 1.23 2001/06/23 02:07:54 csapuntz Exp $ */ +/* $OpenBSD: ffs_softdep.c,v 1.24 2001/11/06 19:53:21 miod Exp $ */ /* * Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved. * @@ -462,7 +462,7 @@ STATIC int stat_inode_bitmap; /* bufs redirtied as inode bitmap not written */ STATIC int stat_direct_blk_ptrs;/* bufs redirtied as direct ptrs not written */ STATIC int stat_dir_entry; /* bufs redirtied as dir entry cannot write */ #ifdef DEBUG -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <sys/sysctl.h> struct ctldebug debug20 = { "max_softdeps", &max_softdeps }; struct ctldebug debug21 = { "tickdelay", &tickdelay }; diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index dae8b5c9528..26e9bbaf9da 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_vnops.c,v 1.19 2001/09/10 08:48:42 gluk Exp $ */ +/* $OpenBSD: ffs_vnops.c,v 1.20 2001/11/06 19:53:21 miod Exp $ */ /* $NetBSD: ffs_vnops.c,v 1.7 1996/05/11 18:27:24 mycroft Exp $ */ /* @@ -51,8 +51,6 @@ #include <sys/signalvar.h> #include <sys/pool.h> -#include <vm/vm.h> - #include <uvm/uvm_extern.h> #include <miscfs/specfs/specdev.h> diff --git a/sys/ufs/lfs/lfs_alloc.c b/sys/ufs/lfs/lfs_alloc.c index 132de7e5c79..3eea47462fa 100644 --- a/sys/ufs/lfs/lfs_alloc.c +++ b/sys/ufs/lfs/lfs_alloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lfs_alloc.c,v 1.7 1999/01/11 05:12:38 millert Exp $ */ +/* $OpenBSD: lfs_alloc.c,v 1.8 2001/11/06 19:53:21 miod Exp $ */ /* $NetBSD: lfs_alloc.c,v 1.4 1996/03/25 12:53:37 pk Exp $ */ /* @@ -46,7 +46,7 @@ #include <sys/mount.h> #include <sys/malloc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <ufs/ufs/quota.h> #include <ufs/ufs/inode.h> diff --git a/sys/ufs/lfs/lfs_balloc.c b/sys/ufs/lfs/lfs_balloc.c index 9753c4372d7..490aa1da0c2 100644 --- a/sys/ufs/lfs/lfs_balloc.c +++ b/sys/ufs/lfs/lfs_balloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lfs_balloc.c,v 1.6 2001/08/12 20:18:30 mickey Exp $ */ +/* $OpenBSD: lfs_balloc.c,v 1.7 2001/11/06 19:53:21 miod Exp $ */ /* $NetBSD: lfs_balloc.c,v 1.3 1996/02/09 22:28:48 christos Exp $ */ /* @@ -54,7 +54,7 @@ #include <ufs/lfs/lfs.h> #include <ufs/lfs/lfs_extern.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> int lfs_fragextend __P((struct vnode *vp, int osize, int nsize, daddr_t lbn, struct buf **bpp)); diff --git a/sys/ufs/lfs/lfs_inode.c b/sys/ufs/lfs/lfs_inode.c index 6dd0904c44f..c8aac750a5b 100644 --- a/sys/ufs/lfs/lfs_inode.c +++ b/sys/ufs/lfs/lfs_inode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lfs_inode.c,v 1.7 1999/01/11 05:12:38 millert Exp $ */ +/* $OpenBSD: lfs_inode.c,v 1.8 2001/11/06 19:53:21 miod Exp $ */ /* $NetBSD: lfs_inode.c,v 1.5 1996/05/11 18:27:35 mycroft Exp $ */ /* @@ -46,7 +46,7 @@ #include <sys/kernel.h> #include <sys/malloc.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <ufs/ufs/quota.h> #include <ufs/ufs/inode.h> diff --git a/sys/ufs/lfs/lfs_vnops.c b/sys/ufs/lfs/lfs_vnops.c index 9e40dbf1b8d..05f54d91e53 100644 --- a/sys/ufs/lfs/lfs_vnops.c +++ b/sys/ufs/lfs/lfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lfs_vnops.c,v 1.5 1997/05/30 08:34:51 downsj Exp $ */ +/* $OpenBSD: lfs_vnops.c,v 1.6 2001/11/06 19:53:21 miod Exp $ */ /* $NetBSD: lfs_vnops.c,v 1.11 1996/05/11 18:27:41 mycroft Exp $ */ /* @@ -51,7 +51,7 @@ #include <sys/malloc.h> #include <sys/signalvar.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <miscfs/specfs/specdev.h> #include <miscfs/fifofs/fifo.h> diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c index ca871beca12..b7d5802ddc8 100644 --- a/sys/ufs/ufs/ufs_lookup.c +++ b/sys/ufs/ufs/ufs_lookup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs_lookup.c,v 1.17 2001/06/27 04:58:49 art Exp $ */ +/* $OpenBSD: ufs_lookup.c,v 1.18 2001/11/06 19:53:21 miod Exp $ */ /* $NetBSD: ufs_lookup.c,v 1.7 1996/02/09 22:36:06 christos Exp $ */ /* @@ -51,7 +51,7 @@ #include <sys/mount.h> #include <sys/vnode.h> -#include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <ufs/ufs/quota.h> #include <ufs/ufs/inode.h> diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 33109b9f4f3..684a0a1f563 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs_vnops.c,v 1.37 2001/09/05 19:22:23 deraadt Exp $ */ +/* $OpenBSD: ufs_vnops.c,v 1.38 2001/11/06 19:53:21 miod Exp $ */ /* $NetBSD: ufs_vnops.c,v 1.18 1996/05/11 18:28:04 mycroft Exp $ */ /* @@ -58,8 +58,6 @@ #include <sys/lockf.h> #include <sys/event.h> -#include <vm/vm.h> - #include <uvm/uvm_extern.h> #include <miscfs/specfs/specdev.h> diff --git a/sys/uvm/uvm_swap_encrypt.c b/sys/uvm/uvm_swap_encrypt.c index 7ce5136cdd3..fbcce3c9e8f 100644 --- a/sys/uvm/uvm_swap_encrypt.c +++ b/sys/uvm/uvm_swap_encrypt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_swap_encrypt.c,v 1.9 2001/08/24 15:59:42 markus Exp $ */ +/* $OpenBSD: uvm_swap_encrypt.c,v 1.10 2001/11/06 19:53:21 miod Exp $ */ /* * Copyright 1999 Niels Provos <provos@citi.umich.edu> @@ -40,8 +40,6 @@ #include <dev/rndvar.h> #include <crypto/rijndael.h> -#include <vm/vm.h> - #include <uvm/uvm.h> struct swap_key *kcur = NULL; diff --git a/sys/xfs/xfs_config.h b/sys/xfs/xfs_config.h index 8fa46a05d0c..2249b2be0f4 100644 --- a/sys/xfs/xfs_config.h +++ b/sys/xfs/xfs_config.h @@ -653,7 +653,7 @@ #define HAVE_UVM_UVM_EXTERN_H 1 /* Define if you have the <vm/vm.h> header file. */ -#define HAVE_VM_VM_H 1 +/* #undef HAVE_VM_VM_H */ /* Define if you have the <vm/vm_extern.h> header file. */ /* #undef HAVE_VM_VM_EXTERN_H */ @@ -662,7 +662,7 @@ /* #undef HAVE_VM_VM_OBJECT_H */ /* Define if you have the <vm/vm_pager.h> header file. */ -#define HAVE_VM_VM_PAGER_H 1 +/* #undef HAVE_VM_VM_PAGER_H */ /* Define if you have the <vm/vm_zone.h> header file. */ /* #undef HAVE_VM_VM_ZONE_H */ |