diff options
Diffstat (limited to 'sys/dev')
86 files changed, 161 insertions, 177 deletions
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 |