diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-09-19 20:51:00 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-09-19 20:51:00 +0000 |
| commit | 26751d4f7e73801bb67ab4abe3c6fab6f014d366 (patch) | |
| tree | 04ee53302fcda940a3ab1ebbec6932ae1bb90ce4 /sys | |
| parent | 4e3bacfaf6ab9f4eda76a92dac84616ea1d02192 (diff) | |
merge vm/vm_kern.h into uvm/uvm_extern.h; art@ ok
Diffstat (limited to 'sys')
89 files changed, 123 insertions, 268 deletions
diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c index e4ec0d48d45..6c83730e370 100644 --- a/sys/arch/alpha/alpha/machdep.c +++ b/sys/arch/alpha/alpha/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.53 2001/09/12 14:20:15 millert Exp $ */ +/* $OpenBSD: machdep.c,v 1.54 2001/09/19 20:50:55 mickey Exp $ */ /* $NetBSD: machdep.c,v 1.206 2000/05/23 05:12:54 thorpej Exp $ */ /*- @@ -103,7 +103,6 @@ #include <sys/mount.h> #include <sys/syscallargs.h> -#include <vm/vm_kern.h> #include <uvm/uvm_extern.h> #include <dev/cons.h> diff --git a/sys/arch/alpha/alpha/vm_machdep.c b/sys/arch/alpha/alpha/vm_machdep.c index 24798a6231b..4f78963b675 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.23 2001/07/25 13:25:31 art Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.24 2001/09/19 20:50:55 mickey Exp $ */ /* $NetBSD: vm_machdep.c,v 1.55 2000/03/29 03:49:48 simonb Exp $ */ /* @@ -40,8 +40,6 @@ #include <sys/exec.h> #include <vm/vm.h> -#include <vm/vm_kern.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 643950ce1d6..2a09c4552a4 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.3 2001/07/25 13:25:31 art Exp $ */ +/* $OpenBSD: bus_dma.c,v 1.4 2001/09/19 20:50:56 mickey Exp $ */ /* $NetBSD: bus_dma.c,v 1.40 2000/07/17 04:47:56 thorpej Exp $ */ /*- @@ -48,7 +48,6 @@ #include <sys/mbuf.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <uvm/uvm_extern.h> #include <machine/bus.h> diff --git a/sys/arch/amiga/amiga/machdep.c b/sys/arch/amiga/amiga/machdep.c index d9dc31b2fcd..0951719814e 100644 --- a/sys/arch/amiga/amiga/machdep.c +++ b/sys/arch/amiga/amiga/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.53 2001/09/12 00:23:33 art Exp $ */ +/* $OpenBSD: machdep.c,v 1.54 2001/09/19 20:50:56 mickey Exp $ */ /* $NetBSD: machdep.c,v 1.95 1997/08/27 18:31:17 is Exp $ */ /* @@ -80,7 +80,7 @@ #define MAXMEM 64*1024 /* XXX - from cmap.h */ #include <vm/vm.h> -#include <vm/vm_kern.h> +#include <uvm/uvm_extern.h> #include <machine/db_machdep.h> #include <ddb/db_sym.h> diff --git a/sys/arch/amiga/amiga/pmap.c b/sys/arch/amiga/amiga/pmap.c index 452fee199aa..eb5a6684ff2 100644 --- a/sys/arch/amiga/amiga/pmap.c +++ b/sys/arch/amiga/amiga/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.34 2001/07/25 13:25:31 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.35 2001/09/19 20:50:56 mickey Exp $ */ /* $NetBSD: pmap.c,v 1.68 1999/06/19 19:44:09 is Exp $ */ /*- @@ -119,9 +119,9 @@ #include <sys/msgbuf.h> #include <vm/vm.h> #include <sys/user.h> -#include <vm/vm_kern.h> #include <vm/vm_page.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/vm_machdep.c b/sys/arch/amiga/amiga/vm_machdep.c index c3f29b2f3d6..0aca59a42c8 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.21 2001/07/25 13:25:31 art Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.22 2001/09/19 20:50:56 mickey Exp $ */ /* $NetBSD: vm_machdep.c,v 1.30 1997/05/19 10:14:50 veego Exp $ */ /* @@ -58,7 +58,6 @@ #include <vm/vm.h> #include <sys/user.h> -#include <vm/vm_kern.h> #include <uvm/uvm_extern.h> #include <machine/pte.h> diff --git a/sys/arch/amiga/dev/sfas.c b/sys/arch/amiga/dev/sfas.c index fdcbeef0572..64fc83840ea 100644 --- a/sys/arch/amiga/dev/sfas.c +++ b/sys/arch/amiga/dev/sfas.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sfas.c,v 1.11 2001/06/27 05:44:44 nate Exp $ */ +/* $OpenBSD: sfas.c,v 1.12 2001/09/19 20:50:56 mickey Exp $ */ /* $NetBSD: sfas.c,v 1.12 1996/10/13 03:07:33 christos Exp $ */ /* @@ -53,7 +53,7 @@ #include <scsi/scsi_all.h> #include <scsi/scsiconf.h> #include <vm/vm.h> -#include <vm/vm_kern.h> +#include <uvm/uvm_extern.h> #include <vm/vm_page.h> #include <machine/pmap.h> #include <machine/cpu.h> diff --git a/sys/arch/amiga/isa/cross.c b/sys/arch/amiga/isa/cross.c index f28c52dcb9f..8dc4fb6a65a 100644 --- a/sys/arch/amiga/isa/cross.c +++ b/sys/arch/amiga/isa/cross.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cross.c,v 1.16 2001/06/27 03:54:13 art Exp $ */ +/* $OpenBSD: cross.c,v 1.17 2001/09/19 20:50:56 mickey Exp $ */ /* * Copyright (c) 1994, 1996 Niklas Hallqvist, Carsten Hammer @@ -38,7 +38,7 @@ #include <sys/systm.h> #include <vm/vm.h> -#include <vm/vm_kern.h> +#include <uvm/uvm_extern.h> #include <machine/bus.h> #include <machine/cpu.h> diff --git a/sys/arch/hp300/hp300/machdep.c b/sys/arch/hp300/hp300/machdep.c index b86accdc438..1ae24c7edcb 100644 --- a/sys/arch/hp300/hp300/machdep.c +++ b/sys/arch/hp300/hp300/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.63 2001/09/11 20:09:56 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.64 2001/09/19 20:50:56 mickey Exp $ */ /* $NetBSD: machdep.c,v 1.121 1999/03/26 23:41:29 mycroft Exp $ */ /* @@ -98,9 +98,7 @@ #include <dev/cons.h> #define MAXMEM 64*1024 /* XXX - from cmap.h */ -#include <vm/vm_kern.h> #include <vm/vm_param.h> - #include <uvm/uvm_extern.h> #include <arch/hp300/dev/hilreg.h> diff --git a/sys/arch/hp300/hp300/pmap.c b/sys/arch/hp300/hp300/pmap.c index 35e5640df41..13c074c8f0e 100644 --- a/sys/arch/hp300/hp300/pmap.c +++ b/sys/arch/hp300/hp300/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.27 2001/07/25 13:25:31 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.28 2001/09/19 20:50:56 mickey Exp $ */ /* $NetBSD: pmap.c,v 1.80 1999/09/16 14:52:06 chs Exp $ */ /*- @@ -143,10 +143,10 @@ #include <machine/pte.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <vm/vm_page.h> #include <uvm/uvm.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> diff --git a/sys/arch/hp300/hp300/vm_machdep.c b/sys/arch/hp300/hp300/vm_machdep.c index 67f2a97cc77..12f3599912c 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.29 2001/07/25 13:25:31 art Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.30 2001/09/19 20:50:56 mickey Exp $ */ /* $NetBSD: vm_machdep.c,v 1.47 1999/03/26 23:41:29 mycroft Exp $ */ /* @@ -60,8 +60,6 @@ #include <machine/reg.h> #include <vm/vm.h> -#include <vm/vm_kern.h> - #include <uvm/uvm_extern.h> /* diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c index 81024d5830a..13c9a7b6513 100644 --- a/sys/arch/hppa/hppa/machdep.c +++ b/sys/arch/hppa/hppa/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.39 2001/09/12 00:23:33 art Exp $ */ +/* $OpenBSD: machdep.c,v 1.40 2001/09/19 20:50:56 mickey Exp $ */ /* * Copyright (c) 1999-2000 Michael Shalayeff @@ -68,7 +68,6 @@ #include <sys/syscallargs.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <uvm/uvm_page.h> #include <uvm/uvm.h> diff --git a/sys/arch/hppa/hppa/mainbus.c b/sys/arch/hppa/hppa/mainbus.c index c640ab83878..b31a8ed923b 100644 --- a/sys/arch/hppa/hppa/mainbus.c +++ b/sys/arch/hppa/hppa/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.12 2001/08/01 20:32:13 miod Exp $ */ +/* $OpenBSD: mainbus.c,v 1.13 2001/09/19 20:50:56 mickey Exp $ */ /* * Copyright (c) 1998-2000 Michael Shalayeff @@ -42,7 +42,6 @@ #include <sys/mbuf.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <uvm/uvm_page.h> #include <uvm/uvm.h> diff --git a/sys/arch/hppa/hppa/trap.c b/sys/arch/hppa/hppa/trap.c index 45a5ae5b58e..6bc8a6a0c12 100644 --- a/sys/arch/hppa/hppa/trap.c +++ b/sys/arch/hppa/hppa/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.29 2001/09/14 14:58:44 art Exp $ */ +/* $OpenBSD: trap.c,v 1.30 2001/09/19 20:50:56 mickey Exp $ */ /* * Copyright (c) 1998-2000 Michael Shalayeff @@ -48,7 +48,6 @@ #include <net/netisr.h> #include <vm/vm.h> -#include <vm/vm_kern.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 b5dd0636f26..60a0504df69 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.24 2001/07/25 13:25:31 art Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.25 2001/09/19 20:50:56 mickey Exp $ */ /* * Copyright (c) 1999-2000 Michael Shalayeff @@ -49,7 +49,6 @@ #include <machine/pcb.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <uvm/uvm.h> diff --git a/sys/arch/i386/i386/bios.c b/sys/arch/i386/i386/bios.c index f69db0c9711..c95b80043a2 100644 --- a/sys/arch/i386/i386/bios.c +++ b/sys/arch/i386/i386/bios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bios.c,v 1.45 2001/07/25 13:25:32 art Exp $ */ +/* $OpenBSD: bios.c,v 1.46 2001/09/19 20:50:56 mickey Exp $ */ /* * Copyright (c) 1997-2001 Michael Shalayeff @@ -44,7 +44,7 @@ #include <sys/extent.h> #include <vm/vm.h> -#include <vm/vm_kern.h> +#include <uvm/uvm_extern.h> #include <sys/sysctl.h> #include <dev/cons.h> diff --git a/sys/arch/i386/i386/gdt.c b/sys/arch/i386/i386/gdt.c index 26b5b12cc2f..d5c42fc8078 100644 --- a/sys/arch/i386/i386/gdt.c +++ b/sys/arch/i386/i386/gdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gdt.c,v 1.15 2001/05/10 07:59:05 art Exp $ */ +/* $OpenBSD: gdt.c,v 1.16 2001/09/19 20:50:56 mickey Exp $ */ /* $NetBSD: gdt.c,v 1.8 1996/05/03 19:42:06 christos Exp $ */ /*- @@ -43,8 +43,6 @@ #include <sys/user.h> #include <vm/vm.h> -#include <vm/vm_kern.h> - #include <uvm/uvm_extern.h> #include <machine/gdt.h> diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 478968028a0..a8883be79e4 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.175 2001/09/12 00:23:33 art Exp $ */ +/* $OpenBSD: machdep.c,v 1.176 2001/09/19 20:50:56 mickey Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -120,9 +120,7 @@ #include <stand/boot/bootarg.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <vm/vm_page.h> - #include <uvm/uvm_extern.h> #include <sys/sysctl.h> diff --git a/sys/arch/i386/i386/pmap.c b/sys/arch/i386/i386/pmap.c index 022ff668013..e3c5fcba23f 100644 --- a/sys/arch/i386/i386/pmap.c +++ b/sys/arch/i386/i386/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.44 2001/08/11 11:45:27 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.45 2001/09/19 20:50:56 mickey Exp $ */ /* $NetBSD: pmap.c,v 1.91 2000/06/02 17:46:37 thorpej Exp $ */ /* @@ -75,7 +75,6 @@ #include <sys/user.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <vm/vm_page.h> #include <uvm/uvm.h> diff --git a/sys/arch/i386/i386/rbus_machdep.c b/sys/arch/i386/i386/rbus_machdep.c index 452d231f109..1dbb3bf6ae9 100644 --- a/sys/arch/i386/i386/rbus_machdep.c +++ b/sys/arch/i386/i386/rbus_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rbus_machdep.c,v 1.11 2001/06/22 21:01:24 mickey Exp $ */ +/* $OpenBSD: rbus_machdep.c,v 1.12 2001/09/19 20:50:56 mickey Exp $ */ /* $NetBSD: rbus_machdep.c,v 1.2 1999/10/15 06:43:06 haya Exp $ */ /* @@ -38,7 +38,6 @@ #include <sys/extent.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <vm/vm_page.h> #include <uvm/uvm_extern.h> diff --git a/sys/arch/i386/i386/sys_machdep.c b/sys/arch/i386/i386/sys_machdep.c index b010d0ebabf..693baee9456 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.14 2001/07/04 08:57:47 niklas Exp $ */ +/* $OpenBSD: sys_machdep.c,v 1.15 2001/09/19 20:50:56 mickey Exp $ */ /* $NetBSD: sys_machdep.c,v 1.28 1996/05/03 19:42:29 christos Exp $ */ /*- @@ -58,8 +58,6 @@ #include <sys/syscallargs.h> #include <vm/vm.h> -#include <vm/vm_kern.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 39ea7a0e6fb..c4ae36e09d9 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.28 2001/07/25 13:25:32 art Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.29 2001/09/19 20:50:56 mickey Exp $ */ /* $NetBSD: vm_machdep.c,v 1.61 1996/05/03 19:42:35 christos Exp $ */ /*- @@ -59,8 +59,6 @@ #include <sys/ptrace.h> #include <vm/vm.h> -#include <vm/vm_kern.h> - #include <uvm/uvm_extern.h> #include <machine/cpu.h> diff --git a/sys/arch/mac68k/dev/nubus.c b/sys/arch/mac68k/dev/nubus.c index c02bcdd07f7..fcc0016941e 100644 --- a/sys/arch/mac68k/dev/nubus.c +++ b/sys/arch/mac68k/dev/nubus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nubus.c,v 1.20 2001/08/20 21:29:23 miod Exp $ */ +/* $OpenBSD: nubus.c,v 1.21 2001/09/19 20:50:56 mickey Exp $ */ /* $NetBSD: nubus.c,v 1.35 1997/04/22 20:20:32 scottr Exp $ */ /* @@ -38,8 +38,6 @@ #include <sys/dmap.h> #include <vm/vm.h> -#include <vm/vm_kern.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 ce4d516f92d..5d191166de8 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.10 2001/07/25 13:25:32 art Exp $ */ +/* $OpenBSD: bus_space.c,v 1.11 2001/09/19 20:50:56 mickey Exp $ */ /* $NetBSD: bus_space.c,v 1.5 1999/03/26 23:41:30 mycroft Exp $ */ /*- @@ -50,8 +50,6 @@ #include <machine/bus.h> #include <vm/vm.h> -#include <vm/vm_kern.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/machdep.c b/sys/arch/mac68k/mac68k/machdep.c index 5e1801d1228..9ddcb8f2906 100644 --- a/sys/arch/mac68k/mac68k/machdep.c +++ b/sys/arch/mac68k/mac68k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.82 2001/09/12 00:23:33 art Exp $ */ +/* $OpenBSD: machdep.c,v 1.83 2001/09/19 20:50:56 mickey Exp $ */ /* $NetBSD: machdep.c,v 1.207 1998/07/08 04:39:34 thorpej Exp $ */ /* @@ -130,8 +130,6 @@ void netintr __P((void)); #define MAXMEM 64*1024 /* XXX - from cmap.h */ #include <vm/vm.h> -#include <vm/vm_kern.h> - #include <uvm/uvm_extern.h> #include <sys/sysctl.h> diff --git a/sys/arch/mac68k/mac68k/pmap.c b/sys/arch/mac68k/mac68k/pmap.c index 04263111092..dbe285f7bc4 100644 --- a/sys/arch/mac68k/mac68k/pmap.c +++ b/sys/arch/mac68k/mac68k/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.28 2001/07/31 15:31:25 beck Exp $ */ +/* $OpenBSD: pmap.c,v 1.29 2001/09/19 20:50:56 mickey Exp $ */ /* $NetBSD: pmap.c,v 1.55 1999/04/22 04:24:53 chs Exp $ */ /* @@ -104,7 +104,6 @@ #include <machine/pte.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <vm/vm_page.h> #include <uvm/uvm.h> diff --git a/sys/arch/macppc/macppc/dma.c b/sys/arch/macppc/macppc/dma.c index 68acbec18f1..0258f412bbf 100644 --- a/sys/arch/macppc/macppc/dma.c +++ b/sys/arch/macppc/macppc/dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dma.c,v 1.2 2001/09/15 01:40:36 mickey Exp $ */ +/* $OpenBSD: dma.c,v 1.3 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -52,7 +52,6 @@ #include <sys/mount.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <uvm/uvm.h> #include <uvm/uvm_page.h> diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c index 3a07d57eac5..81e86fa3c1f 100644 --- a/sys/arch/macppc/macppc/machdep.c +++ b/sys/arch/macppc/macppc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.6 2001/09/18 13:59:24 drahn Exp $ */ +/* $OpenBSD: machdep.c,v 1.7 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -54,7 +54,7 @@ #include <sys/user.h> #include <vm/vm.h> -#include <vm/vm_kern.h> +#include <uvm/uvm_extern.h> #ifdef SYSVSHM #include <sys/shm.h> diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c index ea80750f89f..eaf4b6e0986 100644 --- a/sys/arch/mvme68k/mvme68k/machdep.c +++ b/sys/arch/mvme68k/mvme68k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.52 2001/09/12 00:23:33 art Exp $ */ +/* $OpenBSD: machdep.c,v 1.53 2001/09/19 20:50:56 mickey Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -118,7 +118,6 @@ #include <net/netisr.h> #define MAXMEM 64*1024 /* XXX - from cmap.h */ -#include <vm/vm_kern.h> #include <uvm/uvm_extern.h> diff --git a/sys/arch/mvme68k/mvme68k/pmap.c b/sys/arch/mvme68k/mvme68k/pmap.c index a9362c39221..72ab1f7f886 100644 --- a/sys/arch/mvme68k/mvme68k/pmap.c +++ b/sys/arch/mvme68k/mvme68k/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.27 2001/07/25 13:25:32 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.28 2001/09/19 20:50:56 mickey Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -132,7 +132,6 @@ #include <machine/pte.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <vm/vm_page.h> #include <uvm/uvm.h> diff --git a/sys/arch/mvme68k/mvme68k/vm_machdep.c b/sys/arch/mvme68k/mvme68k/vm_machdep.c index f7b21567d03..e08f7bce735 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.28 2001/08/05 20:35:43 miod Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.29 2001/09/19 20:50:56 mickey Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -56,7 +56,6 @@ #include <machine/reg.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <uvm/uvm_extern.h> /* diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c index ec405addb02..a876adb6c8b 100644 --- a/sys/arch/mvme88k/mvme88k/machdep.c +++ b/sys/arch/mvme88k/mvme88k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.57 2001/09/12 00:23:33 art Exp $ */ +/* $OpenBSD: machdep.c,v 1.58 2001/09/19 20:50:56 mickey Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -96,8 +96,6 @@ #include <dev/cons.h> #include <vm/vm.h> -#include <vm/vm_kern.h> - #include <uvm/uvm_extern.h> #include <mvme88k/dev/sysconreg.h> diff --git a/sys/arch/mvme88k/mvme88k/pmap.c b/sys/arch/mvme88k/mvme88k/pmap.c index 759e56a449c..a6654a4c6b4 100644 --- a/sys/arch/mvme88k/mvme88k/pmap.c +++ b/sys/arch/mvme88k/mvme88k/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.40 2001/08/26 14:31:12 miod Exp $ */ +/* $OpenBSD: pmap.c,v 1.41 2001/09/19 20:50:57 mickey Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * All rights reserved. @@ -57,7 +57,6 @@ #include <sys/user.h> #include <vm/vm.h> -#include <vm/vm_kern.h> /* vm/vm_kern.h */ #include <uvm/uvm.h> #include <machine/asm_macro.h> diff --git a/sys/arch/mvme88k/mvme88k/trap.c b/sys/arch/mvme88k/mvme88k/trap.c index 85110a2602a..450a666795f 100644 --- a/sys/arch/mvme88k/mvme88k/trap.c +++ b/sys/arch/mvme88k/mvme88k/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.22 2001/09/14 14:58:44 art Exp $ */ +/* $OpenBSD: trap.c,v 1.23 2001/09/19 20:50:57 mickey Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -54,7 +54,6 @@ #include <sys/ktrace.h> #include <vm/vm.h> -#include <vm/vm_kern.h> /* kernel_map */ #include <uvm/uvm_extern.h> diff --git a/sys/arch/mvme88k/mvme88k/vm_machdep.c b/sys/arch/mvme88k/mvme88k/vm_machdep.c index 079e064dec0..b37ad773e11 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.32 2001/08/26 14:31:12 miod Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.33 2001/09/19 20:50:57 mickey Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. @@ -57,7 +57,6 @@ #include <sys/extent.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <uvm/uvm_extern.h> diff --git a/sys/arch/mvmeppc/mvmeppc/bus_dma.c b/sys/arch/mvmeppc/mvmeppc/bus_dma.c index 5acfe71d73a..c00ab320083 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.4 2001/07/25 13:25:32 art Exp $ */ +/* $OpenBSD: bus_dma.c,v 1.5 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: bus_dma.c,v 1.2 2001/06/10 02:31:25 briggs Exp $ */ /*- @@ -52,7 +52,6 @@ #include <sys/mount.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <uvm/uvm.h> #include <uvm/uvm_page.h> diff --git a/sys/arch/mvmeppc/mvmeppc/machdep.c b/sys/arch/mvmeppc/mvmeppc/machdep.c index b7cc92df46f..8d0fc44de01 100644 --- a/sys/arch/mvmeppc/mvmeppc/machdep.c +++ b/sys/arch/mvmeppc/mvmeppc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.9 2001/09/12 00:23:34 art Exp $ */ +/* $OpenBSD: machdep.c,v 1.10 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -52,7 +52,7 @@ #include <sys/user.h> #include <vm/vm.h> -#include <vm/vm_kern.h> +#include <uvm/uvm_extern.h> #ifdef SYSVSHM #include <sys/shm.h> diff --git a/sys/arch/powerpc/powerpc/pmap.c b/sys/arch/powerpc/powerpc/pmap.c index ef7fe38409e..82a902b1d85 100644 --- a/sys/arch/powerpc/powerpc/pmap.c +++ b/sys/arch/powerpc/powerpc/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.44 2001/09/18 13:59:23 drahn Exp $ */ +/* $OpenBSD: pmap.c,v 1.45 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: pmap.c,v 1.1 1996/09/30 16:34:52 ws Exp $ */ /* @@ -40,7 +40,6 @@ #include <sys/pool.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <uvm/uvm.h> diff --git a/sys/arch/powerpc/powerpc/trap.c b/sys/arch/powerpc/powerpc/trap.c index 97d7b677fa5..a310741c766 100644 --- a/sys/arch/powerpc/powerpc/trap.c +++ b/sys/arch/powerpc/powerpc/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.31 2001/09/18 01:51:54 drahn Exp $ */ +/* $OpenBSD: trap.c,v 1.32 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: trap.c,v 1.3 1996/10/13 03:31:37 christos Exp $ */ /* @@ -50,7 +50,6 @@ #include <machine/db_machdep.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <uvm/uvm_extern.h> diff --git a/sys/arch/powerpc/powerpc/vm_machdep.c b/sys/arch/powerpc/powerpc/vm_machdep.c index 2d5b3ccfc46..38796d78134 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.22 2001/09/17 15:14:15 drahn Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.23 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: vm_machdep.c,v 1.1 1996/09/30 16:34:57 ws Exp $ */ /* @@ -40,7 +40,6 @@ #include <sys/vnode.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <uvm/uvm_extern.h> diff --git a/sys/arch/sparc/sparc/iommu.c b/sys/arch/sparc/sparc/iommu.c index 91978ace2ea..98ed227357b 100644 --- a/sys/arch/sparc/sparc/iommu.c +++ b/sys/arch/sparc/sparc/iommu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iommu.c,v 1.9 2001/07/25 13:25:33 art Exp $ */ +/* $OpenBSD: iommu.c,v 1.10 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: iommu.c,v 1.13 1997/07/29 09:42:04 fair Exp $ */ /* @@ -40,8 +40,8 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> + #include <vm/vm.h> -#include <vm/vm_kern.h> #include <uvm/uvm.h> #include <machine/pmap.h> diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c index d689907ce16..294b30ff391 100644 --- a/sys/arch/sparc/sparc/machdep.c +++ b/sys/arch/sparc/sparc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.64 2001/09/17 15:18:16 art Exp $ */ +/* $OpenBSD: machdep.c,v 1.65 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: machdep.c,v 1.85 1997/09/12 08:55:02 pk Exp $ */ /* @@ -78,7 +78,6 @@ #include <sys/extent.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <vm/vm_page.h> #include <machine/autoconf.h> diff --git a/sys/arch/sparc/sparc/mem.c b/sys/arch/sparc/sparc/mem.c index 79b37e0ec4a..434dec5bcd6 100644 --- a/sys/arch/sparc/sparc/mem.c +++ b/sys/arch/sparc/sparc/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.16 2001/07/25 13:25:33 art Exp $ */ +/* $OpenBSD: mem.c,v 1.17 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: mem.c,v 1.13 1996/03/30 21:12:16 christos Exp $ */ /* @@ -58,7 +58,7 @@ #include <machine/conf.h> #include <vm/vm.h> -#include <vm/vm_kern.h> +#include <uvm/uvm_extern.h> extern vaddr_t prom_vstart; extern vaddr_t prom_vend; diff --git a/sys/arch/sparc/sparc/pmap.c b/sys/arch/sparc/sparc/pmap.c index c1bf259d53d..6f01fa66b3a 100644 --- a/sys/arch/sparc/sparc/pmap.c +++ b/sys/arch/sparc/sparc/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.90 2001/08/12 15:19:58 mickey Exp $ */ +/* $OpenBSD: pmap.c,v 1.91 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: pmap.c,v 1.118 1998/05/19 19:00:18 thorpej Exp $ */ /* @@ -69,7 +69,6 @@ #include <sys/lock.h> #include <vm/vm.h> -#include <vm/vm_kern.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 14e12abad58..39ccfa3a0a2 100644 --- a/sys/arch/sparc/sparc/trap.c +++ b/sys/arch/sparc/sparc/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.31 2001/09/14 09:39:53 art Exp $ */ +/* $OpenBSD: trap.c,v 1.32 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: trap.c,v 1.58 1997/09/12 08:55:01 pk Exp $ */ /* @@ -66,7 +66,7 @@ #endif #include <vm/vm.h> -#include <vm/vm_kern.h> +#include <uvm/uvm_extern.h> #include <sparc/sparc/asm.h> #include <machine/cpu.h> diff --git a/sys/arch/sparc/sparc/vm_machdep.c b/sys/arch/sparc/sparc/vm_machdep.c index d552abf11b7..efaa90663c8 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.31 2001/09/17 15:18:16 art Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.32 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: vm_machdep.c,v 1.30 1997/03/10 23:55:40 pk Exp $ */ /* @@ -63,7 +63,7 @@ #include <sys/extent.h> #include <vm/vm.h> -#include <vm/vm_kern.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> #include <machine/frame.h> diff --git a/sys/arch/sparc64/dev/iommu.c b/sys/arch/sparc64/dev/iommu.c index a25ab861b30..d6ef66d29c0 100644 --- a/sys/arch/sparc64/dev/iommu.c +++ b/sys/arch/sparc64/dev/iommu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iommu.c,v 1.2 2001/08/18 21:30:00 jason Exp $ */ +/* $OpenBSD: iommu.c,v 1.3 2001/09/19 20:50:58 mickey Exp $ */ /* $NetBSD: iommu.c,v 1.37 2001/08/06 22:02:58 eeh Exp $ */ /* @@ -120,7 +120,6 @@ #include <sys/device.h> #include <vm/vm.h> -#include <vm/vm_kern.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 6a14b9e003c..b22339a1a4d 100644 --- a/sys/arch/sparc64/sparc64/cpu.c +++ b/sys/arch/sparc64/sparc64/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.2 2001/08/20 20:23:53 jason Exp $ */ +/* $OpenBSD: cpu.c,v 1.3 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: cpu.c,v 1.13 2001/05/26 21:27:15 chs Exp $ */ /* @@ -57,7 +57,6 @@ #include <sys/device.h> #include <vm/vm.h> -#include <vm/vm_kern.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 0fab1f26264..ce68ae4e889 100644 --- a/sys/arch/sparc64/sparc64/machdep.c +++ b/sys/arch/sparc64/sparc64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.17 2001/09/07 16:20:07 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.18 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */ /*- @@ -105,7 +105,6 @@ #include <sys/exec.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <uvm/uvm.h> #include <sys/sysctl.h> diff --git a/sys/arch/sparc64/sparc64/pmap.c b/sys/arch/sparc64/sparc64/pmap.c index 6b8cfffc730..ae7bb64749e 100644 --- a/sys/arch/sparc64/sparc64/pmap.c +++ b/sys/arch/sparc64/sparc64/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.2 2001/08/20 20:23:53 jason Exp $ */ +/* $OpenBSD: pmap.c,v 1.3 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: pmap.c,v 1.106 2001/08/09 01:01:31 eeh Exp $ */ #undef NO_VCACHE /* Don't forget the locked TLB in dostart */ #define HWREF @@ -40,7 +40,6 @@ #include <sys/kcore.h> #include <vm/vm.h> -#include <vm/vm_kern.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 45c0672e28b..d71da2ef690 100644 --- a/sys/arch/sparc64/sparc64/trap.c +++ b/sys/arch/sparc64/sparc64/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.7 2001/08/31 06:37:19 art Exp $ */ +/* $OpenBSD: trap.c,v 1.8 2001/09/19 20:50:58 mickey Exp $ */ /* $NetBSD: trap.c,v 1.73 2001/08/09 01:03:01 eeh Exp $ */ /* @@ -68,7 +68,6 @@ #endif #include <vm/vm.h> -#include <vm/vm_kern.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 caa47bd88d0..6dc851ef600 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.2 2001/08/20 20:23:53 jason Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.3 2001/09/19 20:50:58 mickey Exp $ */ /* $NetBSD: vm_machdep.c,v 1.38 2001/06/30 00:02:20 eeh Exp $ */ /* @@ -61,7 +61,6 @@ #include <sys/signalvar.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <uvm/uvm_extern.h> #include <machine/cpu.h> diff --git a/sys/arch/sun3/sun3/autoconf.c b/sys/arch/sun3/sun3/autoconf.c index cd690b507a7..85ecc8cfe8d 100644 --- a/sys/arch/sun3/sun3/autoconf.c +++ b/sys/arch/sun3/sun3/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.15 2001/08/11 23:21:14 art Exp $ */ +/* $OpenBSD: autoconf.c,v 1.16 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: autoconf.c,v 1.37 1996/11/20 18:57:22 gwr Exp $ */ /*- @@ -60,8 +60,6 @@ #include <scsi/scsiconf.h> #include <vm/vm.h> -#include <vm/vm_kern.h> - #include <uvm/uvm_extern.h> #include <machine/autoconf.h> diff --git a/sys/arch/sun3/sun3/dvma.c b/sys/arch/sun3/sun3/dvma.c index fb9d3909118..285e3cc9dd1 100644 --- a/sys/arch/sun3/sun3/dvma.c +++ b/sys/arch/sun3/sun3/dvma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dvma.c,v 1.12 2001/08/11 23:21:14 art Exp $ */ +/* $OpenBSD: dvma.c,v 1.13 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: dvma.c,v 1.5 1996/11/20 18:57:29 gwr Exp $ */ /*- @@ -50,7 +50,6 @@ #include <sys/exec.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <uvm/uvm.h> diff --git a/sys/arch/sun3/sun3/machdep.c b/sys/arch/sun3/sun3/machdep.c index af82da243ee..99b9dba642b 100644 --- a/sys/arch/sun3/sun3/machdep.c +++ b/sys/arch/sun3/sun3/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.41 2001/09/14 09:07:50 art Exp $ */ +/* $OpenBSD: machdep.c,v 1.42 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: machdep.c,v 1.77 1996/10/13 03:47:51 christos Exp $ */ /* @@ -80,7 +80,6 @@ #endif #include <vm/vm.h> -#include <vm/vm_kern.h> #include <uvm/uvm_extern.h> diff --git a/sys/arch/sun3/sun3/pmap.c b/sys/arch/sun3/sun3/pmap.c index dadbe19b166..bc763e86ff1 100644 --- a/sys/arch/sun3/sun3/pmap.c +++ b/sys/arch/sun3/sun3/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.28 2001/07/25 13:25:33 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.29 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: pmap.c,v 1.64 1996/11/20 18:57:35 gwr Exp $ */ /*- @@ -79,7 +79,6 @@ #include <sys/queue.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <vm/vm_page.h> #include <uvm/uvm.h> diff --git a/sys/arch/sun3/sun3/vm_machdep.c b/sys/arch/sun3/sun3/vm_machdep.c index 7ac7cf08602..bf7f4f59b99 100644 --- a/sys/arch/sun3/sun3/vm_machdep.c +++ b/sys/arch/sun3/sun3/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.19 2001/08/12 21:55:52 mickey Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.20 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: vm_machdep.c,v 1.35 1996/04/26 18:38:06 gwr Exp $ */ /* @@ -56,7 +56,6 @@ #include <sys/core.h> #include <sys/exec.h> -#include <vm/vm_kern.h> #include <uvm/uvm_extern.h> #include <machine/cpu.h> diff --git a/sys/arch/vax/if/if_le.c b/sys/arch/vax/if/if_le.c index f37a00d2f6e..fbdcf4d626d 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.6 2001/08/25 13:33:36 hugh Exp $ */ +/* $OpenBSD: if_le.c,v 1.7 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: if_le.c,v 1.14 1999/08/14 18:40:23 ragge Exp $ */ /*- @@ -85,7 +85,7 @@ #include <sys/reboot.h> #include <vm/vm.h> -#include <vm/vm_kern.h> +#include <uvm/uvm_extern.h> #include <net/if.h> #include <net/if_media.h> diff --git a/sys/arch/vax/vax/bus_dma.c b/sys/arch/vax/vax/bus_dma.c index e53d3bb5e58..6f87bed6bf1 100644 --- a/sys/arch/vax/vax/bus_dma.c +++ b/sys/arch/vax/vax/bus_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_dma.c,v 1.4 2001/08/02 21:30:30 hugh Exp $ */ +/* $OpenBSD: bus_dma.c,v 1.5 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: bus_dma.c,v 1.5 1999/11/13 00:32:20 thorpej Exp $ */ /*- @@ -57,7 +57,6 @@ #include <sys/device.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <vm/vm_page.h> #include <uvm/uvm_extern.h> diff --git a/sys/arch/vax/vax/bus_mem.c b/sys/arch/vax/vax/bus_mem.c index 4f51408a5c0..95b908cece7 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.2 2000/10/18 21:37:35 bjc Exp $ */ +/* $OpenBSD: bus_mem.c,v 1.3 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: bus_mem.c,v 1.8 2000/06/29 07:14:23 mrg Exp $ */ /* * Copyright (c) 1998 Matt Thomas @@ -40,7 +40,7 @@ #include <sys/systm.h> #include <vm/vm.h> -#include <vm/vm_kern.h> +#include <uvm/uvm_extern.h> #include <machine/cpu.h> #include <machine/pmap.h> diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c index a10f66c1bf2..505ad25f327 100644 --- a/sys/arch/vax/vax/machdep.c +++ b/sys/arch/vax/vax/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.39 2001/09/12 00:23:34 art Exp $ */ +/* $OpenBSD: machdep.c,v 1.40 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $ */ /* @@ -72,7 +72,7 @@ #include <dev/cons.h> #include <vm/vm.h> -#include <vm/vm_kern.h> +#include <uvm/uvm_extern.h> #ifdef SYSVMSG #include <sys/msg.h> diff --git a/sys/arch/vax/vax/trap.c b/sys/arch/vax/vax/trap.c index 645de9d2eb1..1b0421c35ff 100644 --- a/sys/arch/vax/vax/trap.c +++ b/sys/arch/vax/vax/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.15 2001/09/14 14:57:43 art Exp $ */ +/* $OpenBSD: trap.c,v 1.16 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: trap.c,v 1.47 1999/08/21 19:26:20 matt Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden. @@ -41,9 +41,10 @@ #include <sys/exec.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <vm/vm_page.h> +#include <uvm/uvm_extern.h> + #include <machine/mtpr.h> #include <machine/pte.h> #include <machine/pcb.h> diff --git a/sys/arch/vax/vax/vm_machdep.c b/sys/arch/vax/vax/vm_machdep.c index 54e91bce731..a373880857f 100644 --- a/sys/arch/vax/vax/vm_machdep.c +++ b/sys/arch/vax/vax/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.22 2001/07/25 13:25:33 art Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.23 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: vm_machdep.c,v 1.67 2000/06/29 07:14:34 mrg Exp $ */ /* @@ -44,9 +44,10 @@ #include <sys/device.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <vm/vm_page.h> +#include <uvm/uvm_extern.h> + #include <machine/vmparam.h> #include <machine/mtpr.h> #include <machine/pmap.h> diff --git a/sys/arch/vax/vsa/vsbus.c b/sys/arch/vax/vsa/vsbus.c index bbf9fe688e8..ea615e9ba68 100644 --- a/sys/arch/vax/vsa/vsbus.c +++ b/sys/arch/vax/vsa/vsbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vsbus.c,v 1.7 2001/08/25 13:33:37 hugh Exp $ */ +/* $OpenBSD: vsbus.c,v 1.8 2001/09/19 20:50:57 mickey Exp $ */ /* $NetBSD: vsbus.c,v 1.29 2000/06/29 07:14:37 mrg Exp $ */ /* * Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden. @@ -49,7 +49,7 @@ #include <sys/stat.h> #include <vm/vm.h> -#include <vm/vm_kern.h> +#include <uvm/uvm_extern.h> #define _VAX_BUS_DMA_PRIVATE #include <machine/bus.h> diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c index 7e84a4025e8..45f531c80bc 100644 --- a/sys/ddb/db_break.c +++ b/sys/ddb/db_break.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_break.c,v 1.8 1999/09/11 00:44:59 mickey Exp $ */ +/* $OpenBSD: db_break.c,v 1.9 2001/09/19 20:50:58 mickey Exp $ */ /* $NetBSD: db_break.c,v 1.7 1996/03/30 22:30:03 christos Exp $ */ /* @@ -37,6 +37,7 @@ #include <sys/proc.h> #include <vm/vm.h> +#include <uvm/uvm_extern.h> #include <machine/db_machdep.h> /* type definitions */ @@ -312,8 +313,6 @@ db_listbreak_cmd(addr, have_addr, count, modif) db_list_breakpoints(); } -#include <vm/vm_kern.h> - /* * We want ddb to be usable before most of the kernel has been * initialized. In particular, current_thread() or kernel_map diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c index beec21881ae..9da3130e65e 100644 --- a/sys/dev/ccd.c +++ b/sys/dev/ccd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ccd.c,v 1.43 2001/06/27 04:45:56 art Exp $ */ +/* $OpenBSD: ccd.c,v 1.44 2001/09/19 20:50:58 mickey Exp $ */ /* $NetBSD: ccd.c,v 1.33 1996/05/05 04:21:14 thorpej Exp $ */ /*- @@ -117,8 +117,6 @@ #include <dev/ccdvar.h> #include <vm/vm.h> -#include <vm/vm_kern.h> - #include <uvm/uvm_extern.h> #ifdef __GNUC__ diff --git a/sys/dev/ic/pdqvar.h b/sys/dev/ic/pdqvar.h index fe47ff1ee20..2286f72e86a 100644 --- a/sys/dev/ic/pdqvar.h +++ b/sys/dev/ic/pdqvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pdqvar.h,v 1.12 2001/06/27 04:45:58 art Exp $ */ +/* $OpenBSD: pdqvar.h,v 1.13 2001/09/19 20:50:58 mickey Exp $ */ /* $NetBSD: pdqvar.h,v 1.11 1996/10/25 21:33:37 cgd Exp $ */ /*- @@ -71,7 +71,7 @@ enum _pdq_type_t { #endif /* M_CAST */ #include <sys/malloc.h> #include <vm/vm.h> -#include <vm/vm_kern.h> +#include <uvm/uvm_extern.h> #define PDQ_USE_MBUFS #if defined(__NetBSD__) || defined(__OpenBSD__) diff --git a/sys/dev/ic/sti.c b/sys/dev/ic/sti.c index c7321d4392b..49d771c4b87 100644 --- a/sys/dev/ic/sti.c +++ b/sys/dev/ic/sti.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sti.c,v 1.5 2001/03/20 08:32:20 mickey Exp $ */ +/* $OpenBSD: sti.c,v 1.6 2001/09/19 20:50:58 mickey Exp $ */ /* * Copyright (c) 2000-2001 Michael Shalayeff @@ -43,7 +43,6 @@ #include <sys/malloc.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <uvm/uvm.h> #include <machine/bus.h> diff --git a/sys/dev/pci/if_wxvar.h b/sys/dev/pci/if_wxvar.h index c0b3a7f83d4..b73861466ee 100644 --- a/sys/dev/pci/if_wxvar.h +++ b/sys/dev/pci/if_wxvar.h @@ -279,9 +279,11 @@ struct wxmdvar { #endif #include <vm/vm.h> -#include <vm/vm_kern.h> +#include <uvm/uvm_extern.h> + #include <machine/bus.h> #include <machine/intr.h> + #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcidevs.h> diff --git a/sys/dev/ramdisk.c b/sys/dev/ramdisk.c index 5b281c0e2db..663718d9c9a 100644 --- a/sys/dev/ramdisk.c +++ b/sys/dev/ramdisk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ramdisk.c,v 1.14 2001/07/08 05:43:16 millert Exp $ */ +/* $OpenBSD: ramdisk.c,v 1.15 2001/09/19 20:50:58 mickey Exp $ */ /* $NetBSD: ramdisk.c,v 1.8 1996/04/12 08:30:09 leo Exp $ */ /* @@ -60,8 +60,6 @@ #include <sys/dkio.h> #include <vm/vm.h> -#include <vm/vm_kern.h> - #include <uvm/uvm_extern.h> #include <dev/ramdisk.h> diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 3f978b65554..bb4ccaa8db6 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_exec.c,v 1.56 2001/08/25 20:37:06 art Exp $ */ +/* $OpenBSD: kern_exec.c,v 1.57 2001/09/19 20:50:58 mickey Exp $ */ /* $NetBSD: kern_exec.c,v 1.75 1996/02/09 18:59:28 christos Exp $ */ /*- @@ -59,8 +59,6 @@ #include <sys/syscallargs.h> #include <vm/vm.h> -#include <vm/vm_kern.h> - #include <uvm/uvm_extern.h> #include <machine/cpu.h> diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 1c1e43c03c3..20921bd35d7 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_fork.c,v 1.42 2001/06/27 07:14:22 art Exp $ */ +/* $OpenBSD: kern_fork.c,v 1.43 2001/09/19 20:50:58 mickey Exp $ */ /* $NetBSD: kern_fork.c,v 1.29 1996/02/09 18:59:34 christos Exp $ */ /* @@ -62,8 +62,6 @@ #include <sys/syscallargs.h> #include <vm/vm.h> -#include <vm/vm_kern.h> - #include <uvm/uvm_extern.h> #include <uvm/uvm_map.h> diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c index a802528e017..0bf07fdc3fa 100644 --- a/sys/kern/kern_lkm.c +++ b/sys/kern/kern_lkm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_lkm.c,v 1.32 2001/08/12 20:33:50 mickey Exp $ */ +/* $OpenBSD: kern_lkm.c,v 1.33 2001/09/19 20:50:58 mickey Exp $ */ /* $NetBSD: kern_lkm.c,v 1.31 1996/03/31 21:40:27 christos Exp $ */ /* @@ -60,7 +60,7 @@ #include <sys/syscall.h> #include <vm/vm.h> -#include <vm/vm_kern.h> +#include <uvm/uvm_extern.h> #ifdef DDB #include <machine/db_machdep.h> diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 7ee4413a02c..96b81397dce 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_malloc.c,v 1.38 2001/08/17 23:39:58 art Exp $ */ +/* $OpenBSD: kern_malloc.c,v 1.39 2001/09/19 20:50:58 mickey Exp $ */ /* $NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $ */ /* @@ -45,8 +45,6 @@ #include <sys/sysctl.h> #include <vm/vm.h> -#include <vm/vm_kern.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 42e862467e1..ac88d6725b5 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.12 2001/08/30 12:42:41 mpech Exp $ */ +/* $OpenBSD: kern_malloc_debug.c,v 1.13 2001/09/19 20:50:58 mickey Exp $ */ /* * Copyright (c) 1999, 2000 Artur Grabowski <art@openbsd.org> @@ -61,7 +61,6 @@ #include <sys/pool.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <uvm/uvm.h> /* diff --git a/sys/kern/subr_pool.c b/sys/kern/subr_pool.c index b660b65076c..d196084ea80 100644 --- a/sys/kern/subr_pool.c +++ b/sys/kern/subr_pool.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_pool.c,v 1.12 2001/08/07 21:02:22 art Exp $ */ +/* $OpenBSD: subr_pool.c,v 1.13 2001/09/19 20:50:58 mickey Exp $ */ /* $NetBSD: subr_pool.c,v 1.59 2001/06/05 18:51:04 thorpej Exp $ */ /*- @@ -50,8 +50,6 @@ #include <sys/sysctl.h> #include <vm/vm.h> -#include <vm/vm_kern.h> - #include <uvm/uvm.h> /* diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c index db8e433309d..d9772d607f0 100644 --- a/sys/kern/subr_prof.c +++ b/sys/kern/subr_prof.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_prof.c,v 1.7 2001/09/17 14:26:36 art Exp $ */ +/* $OpenBSD: subr_prof.c,v 1.8 2001/09/19 20:50:59 mickey Exp $ */ /* $NetBSD: subr_prof.c,v 1.12 1996/04/22 01:38:50 christos Exp $ */ /*- @@ -50,7 +50,6 @@ #include <sys/malloc.h> #include <sys/gmon.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <uvm/uvm_extern.h> /* diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 5f0e3983465..13084a9ed56 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_pipe.c,v 1.37 2001/07/05 07:15:07 art Exp $ */ +/* $OpenBSD: sys_pipe.c,v 1.38 2001/09/19 20:50:58 mickey Exp $ */ /* * Copyright (c) 1996 John S. Dyson @@ -48,8 +48,6 @@ #include <sys/lock.h> #include <vm/vm.h> -#include <vm/vm_kern.h> - #include <uvm/uvm_extern.h> #include <sys/pipe.h> diff --git a/sys/uvm/uvm_anon.c b/sys/uvm/uvm_anon.c index ab15cec84da..e908837eab0 100644 --- a/sys/uvm/uvm_anon.c +++ b/sys/uvm/uvm_anon.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_anon.c,v 1.9 2001/07/26 19:37:13 art Exp $ */ +/* $OpenBSD: uvm_anon.c,v 1.10 2001/09/19 20:50:59 mickey Exp $ */ /* $NetBSD: uvm_anon.c,v 1.5 2000/01/11 06:57:49 chs Exp $ */ /* @@ -46,7 +46,6 @@ #include <vm/vm.h> #include <vm/vm_page.h> -#include <vm/vm_kern.h> #include <uvm/uvm.h> #include <uvm/uvm_swap.h> diff --git a/sys/uvm/uvm_extern.h b/sys/uvm/uvm_extern.h index 86c128c018a..baafdc94a5a 100644 --- a/sys/uvm/uvm_extern.h +++ b/sys/uvm/uvm_extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_extern.h,v 1.23 2001/08/12 22:41:15 mickey Exp $ */ +/* $OpenBSD: uvm_extern.h,v 1.24 2001/09/19 20:50:59 mickey Exp $ */ /* $NetBSD: uvm_extern.h,v 1.42 2000/06/08 05:52:34 thorpej Exp $ */ /* @@ -196,6 +196,7 @@ struct uio; struct uvm_object; struct vm_anon; struct vm_aref; +struct vm_map; struct vmspace; struct pmap; struct vnode; @@ -302,6 +303,15 @@ struct uvmexp { #ifdef _KERNEL +/* + * the various kernel maps, owned by MD code + */ +extern struct vm_map *exec_map; +extern struct vm_map *kernel_map; +extern struct vm_map *kmem_map; +extern struct vm_map *mb_map; +extern struct vm_map *phys_map; + extern struct uvmexp uvmexp; /* diff --git a/sys/uvm/uvm_fault.c b/sys/uvm/uvm_fault.c index b848a3a3353..ba194035fd3 100644 --- a/sys/uvm/uvm_fault.c +++ b/sys/uvm/uvm_fault.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_fault.c,v 1.18 2001/08/11 10:57:22 art Exp $ */ +/* $OpenBSD: uvm_fault.c,v 1.19 2001/09/19 20:50:59 mickey Exp $ */ /* $NetBSD: uvm_fault.c,v 1.48 2000/04/10 01:17:41 thorpej Exp $ */ /* @@ -49,7 +49,6 @@ #include <vm/vm.h> #include <vm/vm_page.h> -#include <vm/vm_kern.h> #include <uvm/uvm.h> diff --git a/sys/uvm/uvm_glue.c b/sys/uvm/uvm_glue.c index 0156592effc..21c3f94a42f 100644 --- a/sys/uvm/uvm_glue.c +++ b/sys/uvm/uvm_glue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_glue.c,v 1.19 2001/08/11 10:57:22 art Exp $ */ +/* $OpenBSD: uvm_glue.c,v 1.20 2001/09/19 20:50:59 mickey Exp $ */ /* $NetBSD: uvm_glue.c,v 1.36 2000/06/18 05:20:27 simonb Exp $ */ /* @@ -83,7 +83,6 @@ #include <vm/vm.h> #include <vm/vm_page.h> -#include <vm/vm_kern.h> #include <uvm/uvm.h> diff --git a/sys/uvm/uvm_init.c b/sys/uvm/uvm_init.c index 93e1744d732..d53d960c178 100644 --- a/sys/uvm/uvm_init.c +++ b/sys/uvm/uvm_init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_init.c,v 1.7 2001/08/11 10:57:22 art Exp $ */ +/* $OpenBSD: uvm_init.c,v 1.8 2001/09/19 20:50:59 mickey Exp $ */ /* $NetBSD: uvm_init.c,v 1.12 2000/03/29 03:43:34 simonb Exp $ */ /* @@ -52,7 +52,6 @@ #include <vm/vm.h> #include <vm/vm_page.h> -#include <vm/vm_kern.h> #include <uvm/uvm.h> diff --git a/sys/uvm/uvm_io.c b/sys/uvm/uvm_io.c index 78d20788a57..b8ea27a8ee3 100644 --- a/sys/uvm/uvm_io.c +++ b/sys/uvm/uvm_io.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_io.c,v 1.6 2001/08/11 10:57:22 art Exp $ */ +/* $OpenBSD: uvm_io.c,v 1.7 2001/09/19 20:50:59 mickey Exp $ */ /* $NetBSD: uvm_io.c,v 1.10 2000/06/02 12:02:44 pk Exp $ */ /* @@ -48,7 +48,6 @@ #include <vm/vm.h> #include <vm/vm_page.h> -#include <vm/vm_kern.h> #include <uvm/uvm.h> diff --git a/sys/uvm/uvm_km.c b/sys/uvm/uvm_km.c index ac76b56f1a2..c84d2a2dbf2 100644 --- a/sys/uvm/uvm_km.c +++ b/sys/uvm/uvm_km.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_km.c,v 1.14 2001/08/11 10:57:22 art Exp $ */ +/* $OpenBSD: uvm_km.c,v 1.15 2001/09/19 20:50:59 mickey Exp $ */ /* $NetBSD: uvm_km.c,v 1.35 2000/05/08 23:10:20 thorpej Exp $ */ /* @@ -147,7 +147,6 @@ #include <vm/vm.h> #include <vm/vm_page.h> -#include <vm/vm_kern.h> #include <uvm/uvm.h> diff --git a/sys/uvm/uvm_map.c b/sys/uvm/uvm_map.c index 430bad6983e..cb58056d052 100644 --- a/sys/uvm/uvm_map.c +++ b/sys/uvm/uvm_map.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_map.c,v 1.23 2001/08/11 10:57:22 art Exp $ */ +/* $OpenBSD: uvm_map.c,v 1.24 2001/09/19 20:50:59 mickey Exp $ */ /* $NetBSD: uvm_map.c,v 1.77 2000/06/13 04:10:47 chs Exp $ */ /* @@ -84,7 +84,6 @@ #include <vm/vm.h> #include <vm/vm_page.h> -#include <vm/vm_kern.h> #define UVM_MAP #include <uvm/uvm.h> diff --git a/sys/uvm/uvm_page.c b/sys/uvm/uvm_page.c index a3bf15a4f8b..9307c0bf008 100644 --- a/sys/uvm/uvm_page.c +++ b/sys/uvm/uvm_page.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_page.c,v 1.23 2001/08/25 12:13:27 art Exp $ */ +/* $OpenBSD: uvm_page.c,v 1.24 2001/09/19 20:50:59 mickey Exp $ */ /* $NetBSD: uvm_page.c,v 1.37 2000/06/09 04:43:19 soda Exp $ */ /* @@ -78,7 +78,6 @@ #include <vm/vm.h> #include <vm/vm_page.h> -#include <vm/vm_kern.h> #define UVM_PAGE /* pull in uvm_page.h functions */ #include <uvm/uvm.h> diff --git a/sys/uvm/uvm_pager.c b/sys/uvm/uvm_pager.c index f69f45b16d4..3be80a7388d 100644 --- a/sys/uvm/uvm_pager.c +++ b/sys/uvm/uvm_pager.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_pager.c,v 1.14 2001/08/11 10:57:22 art Exp $ */ +/* $OpenBSD: uvm_pager.c,v 1.15 2001/09/19 20:50:59 mickey Exp $ */ /* $NetBSD: uvm_pager.c,v 1.30 2000/05/20 03:36:06 thorpej Exp $ */ /* @@ -46,7 +46,6 @@ #include <vm/vm.h> #include <vm/vm_page.h> -#include <vm/vm_kern.h> #define UVM_PAGER #include <uvm/uvm.h> diff --git a/sys/vm/vm_kern.h b/sys/vm/vm_kern.h deleted file mode 100644 index 572f95ced24..00000000000 --- a/sys/vm/vm_kern.h +++ /dev/null @@ -1,74 +0,0 @@ -/* $OpenBSD: vm_kern.h,v 1.5 2001/08/12 23:12:06 miod Exp $ */ -/* $NetBSD: vm_kern.h,v 1.11 1998/02/10 14:08:58 mrg Exp $ */ - -/* - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * The Mach Operating System project at Carnegie-Mellon University. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)vm_kern.h 8.1 (Berkeley) 6/11/93 - * - * - * Copyright (c) 1987, 1990 Carnegie-Mellon University. - * All rights reserved. - * - * Authors: Avadis Tevanian, Jr., Michael Wayne Young - * - * Permission to use, copy, modify and distribute this software and - * its documentation is hereby granted, provided that both the copyright - * notice and this permission notice appear in all copies of the - * software, derivative works or modified versions, and any portions - * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" - * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND - * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * Carnegie Mellon requests users of this software to return to - * - * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU - * School of Computer Science - * Carnegie Mellon University - * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie the - * rights to redistribute these changes. - */ - -/* Kernel memory management definitions. */ - -extern vm_map_t exec_map; -extern vm_map_t kernel_map; -extern vm_map_t kmem_map; -extern vm_map_t mb_map; -extern vm_map_t phys_map; |