diff --git a/sys/dev/bi/if_ni.c b/sys/dev/bi/if_ni.c
index 32204c428bca..bc06b9e78125 100644
--- a/sys/dev/bi/if_ni.c
+++ b/sys/dev/bi/if_ni.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ni.c,v 1.39 2010/04/05 07:19:32 joerg Exp $ */
+/*	$NetBSD: if_ni.c,v 1.40 2010/11/13 13:51:57 uebayasi Exp $ */
 /*
  * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
  *
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ni.c,v 1.39 2010/04/05 07:19:32 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ni.c,v 1.40 2010/11/13 13:51:57 uebayasi Exp $");
 
 #include "opt_inet.h"
 
@@ -48,8 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ni.c,v 1.39 2010/04/05 07:19:32 joerg Exp $");
 #include <sys/sockio.h>
 #include <sys/sched.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <net/if.h>
 #include <net/if_ether.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/cardbus/siisata_cardbus.c b/sys/dev/cardbus/siisata_cardbus.c
index 58e206a9b5fb..c2142d33ba13 100644
--- a/sys/dev/cardbus/siisata_cardbus.c
+++ b/sys/dev/cardbus/siisata_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: siisata_cardbus.c,v 1.13 2010/04/01 05:58:52 dyoung Exp $ */
+/* $NetBSD: siisata_cardbus.c,v 1.14 2010/11/13 13:51:58 uebayasi Exp $ */
 /* Id: siisata_pci.c,v 1.11 2008/05/21 16:20:11 jakllsch Exp  */
 
 /*
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siisata_cardbus.c,v 1.13 2010/04/01 05:58:52 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siisata_cardbus.c,v 1.14 2010/11/13 13:51:58 uebayasi Exp $");
 
 #include <sys/types.h>
 #include <sys/malloc.h>
@@ -60,8 +60,6 @@ __KERNEL_RCSID(0, "$NetBSD: siisata_cardbus.c,v 1.13 2010/04/01 05:58:52 dyoung
 #include <sys/kernel.h>
 #include <sys/systm.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/cardbus/cardbusvar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/ic/siisatavar.h>
diff --git a/sys/dev/dmover/dmover_io.c b/sys/dev/dmover/dmover_io.c
index 70703bc56bdd..2d90f1413b08 100644
--- a/sys/dev/dmover/dmover_io.c
+++ b/sys/dev/dmover/dmover_io.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dmover_io.c,v 1.37 2009/12/20 09:36:05 dsl Exp $	*/
+/*	$NetBSD: dmover_io.c,v 1.38 2010/11/13 13:51:58 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dmover_io.c,v 1.37 2009/12/20 09:36:05 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmover_io.c,v 1.38 2010/11/13 13:51:58 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
@@ -75,8 +75,6 @@ __KERNEL_RCSID(0, "$NetBSD: dmover_io.c,v 1.37 2009/12/20 09:36:05 dsl Exp $");
 #include <sys/stat.h>
 #include <sys/kauth.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/dmover/dmovervar.h>
 #include <dev/dmover/dmover_io.h>
 
diff --git a/sys/dev/eisa/ahb.c b/sys/dev/eisa/ahb.c
index 41b849ade6e1..71c9653c3d57 100644
--- a/sys/dev/eisa/ahb.c
+++ b/sys/dev/eisa/ahb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ahb.c,v 1.58 2009/12/04 11:13:04 njoly Exp $	*/
+/*	$NetBSD: ahb.c,v 1.59 2010/11/13 13:51:58 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.58 2009/12/04 11:13:04 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.59 2010/11/13 13:51:58 uebayasi Exp $");
 
 #include "opt_ddb.h"
 
@@ -62,8 +62,6 @@ __KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.58 2009/12/04 11:13:04 njoly Exp $");
 #include <sys/buf.h>
 #include <sys/proc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bus.h>
 #include <sys/intr.h>
 
diff --git a/sys/dev/hpc/bivideo.c b/sys/dev/hpc/bivideo.c
index 9b3c41ac256e..5a4fa53902ba 100644
--- a/sys/dev/hpc/bivideo.c
+++ b/sys/dev/hpc/bivideo.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bivideo.c,v 1.31 2010/08/01 02:47:43 tsutsui Exp $	*/
+/*	$NetBSD: bivideo.c,v 1.32 2010/11/13 13:51:58 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1999-2001
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bivideo.c,v 1.31 2010/08/01 02:47:43 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bivideo.c,v 1.32 2010/11/13 13:51:58 uebayasi Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_hpcfb.h"
@@ -48,8 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: bivideo.c,v 1.31 2010/08/01 02:47:43 tsutsui Exp $")
 #include <sys/ioctl.h>
 #include <sys/reboot.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/bootinfo.h>
diff --git a/sys/dev/hpc/hpcfb.c b/sys/dev/hpc/hpcfb.c
index 662953c6eecf..aa9eaecd8b62 100644
--- a/sys/dev/hpc/hpcfb.c
+++ b/sys/dev/hpc/hpcfb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpcfb.c,v 1.57 2010/08/01 02:43:12 tsutsui Exp $	*/
+/*	$NetBSD: hpcfb.c,v 1.58 2010/11/13 13:51:59 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1999
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.57 2010/08/01 02:43:12 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.58 2010/11/13 13:51:59 uebayasi Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_hpcfb.h"
@@ -61,8 +61,6 @@ __KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.57 2010/08/01 02:43:12 tsutsui Exp $");
 #include <sys/buf.h>
 #include <sys/ioctl.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bus.h>
 
 #include <dev/wscons/wsconsio.h>
diff --git a/sys/dev/i2c/dbcool.c b/sys/dev/i2c/dbcool.c
index 327fbe78ebcf..a326b1f296da 100644
--- a/sys/dev/i2c/dbcool.c
+++ b/sys/dev/i2c/dbcool.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dbcool.c,v 1.25 2010/08/17 23:36:51 pgoyette Exp $ */
+/*	$NetBSD: dbcool.c,v 1.26 2010/11/13 13:51:59 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.25 2010/08/17 23:36:51 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.26 2010/11/13 13:51:59 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -58,8 +58,6 @@ __KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.25 2010/08/17 23:36:51 pgoyette Exp $")
 #include <sys/malloc.h>
 #include <sys/sysctl.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/i2c/dbcool_var.h>
 #include <dev/i2c/dbcool_reg.h>
 
diff --git a/sys/dev/i2c/sgsmix.c b/sys/dev/i2c/sgsmix.c
index 599cd20daf42..c0ed7b0a8232 100644
--- a/sys/dev/i2c/sgsmix.c
+++ b/sys/dev/i2c/sgsmix.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sgsmix.c,v 1.6 2008/08/01 19:33:07 macallan Exp $	*/
+/*	$NetBSD: sgsmix.c,v 1.7 2010/11/13 13:51:59 uebayasi Exp $	*/
 
 /*-
  * Copyright (C) 2005 Michael Lorenz.
@@ -31,7 +31,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sgsmix.c,v 1.6 2008/08/01 19:33:07 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sgsmix.c,v 1.7 2010/11/13 13:51:59 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -40,8 +40,6 @@ __KERNEL_RCSID(0, "$NetBSD: sgsmix.c,v 1.6 2008/08/01 19:33:07 macallan Exp $");
 #include <sys/malloc.h>
 #include <sys/sysctl.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/i2c/i2cvar.h>
 
 #include <dev/i2c/sgsmixvar.h>
diff --git a/sys/dev/i2o/dpti.c b/sys/dev/i2o/dpti.c
index a7d49bec30c8..bb609e69b312 100644
--- a/sys/dev/i2o/dpti.c
+++ b/sys/dev/i2o/dpti.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dpti.c,v 1.42 2009/05/12 14:23:47 cegger Exp $	*/
+/*	$NetBSD: dpti.c,v 1.43 2010/11/13 13:51:59 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2007 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.42 2009/05/12 14:23:47 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.43 2010/11/13 13:51:59 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -71,8 +71,6 @@ __KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.42 2009/05/12 14:23:47 cegger Exp $");
 #include <sys/ioctl.h>
 #include <sys/kauth.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bus.h>
 #ifdef __i386__
 #include <machine/pio.h>
diff --git a/sys/dev/i2o/iop.c b/sys/dev/i2o/iop.c
index 9ff647d26461..08706b9a1a26 100644
--- a/sys/dev/i2o/iop.c
+++ b/sys/dev/i2o/iop.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iop.c,v 1.80 2010/02/21 18:50:10 bouyer Exp $	*/
+/*	$NetBSD: iop.c,v 1.81 2010/11/13 13:51:59 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001, 2002, 2007 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.80 2010/02/21 18:50:10 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.81 2010/11/13 13:51:59 uebayasi Exp $");
 
 #include "iop.h"
 
@@ -52,8 +52,6 @@ __KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.80 2010/02/21 18:50:10 bouyer Exp $");
 #include <sys/kauth.h>
 #include <sys/bus.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/i2o/i2o.h>
 #include <dev/i2o/iopio.h>
 #include <dev/i2o/iopreg.h>
diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c
index e5e77f8ed3f0..38cfa023d96f 100644
--- a/sys/dev/ic/aac.c
+++ b/sys/dev/ic/aac.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: aac.c,v 1.42 2008/12/16 22:35:29 christos Exp $	*/
+/*	$NetBSD: aac.c,v 1.43 2010/11/13 13:51:59 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aac.c,v 1.42 2008/12/16 22:35:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aac.c,v 1.43 2010/11/13 13:51:59 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -82,8 +82,6 @@ __KERNEL_RCSID(0, "$NetBSD: aac.c,v 1.42 2008/12/16 22:35:29 christos Exp $");
 
 #include <sys/bus.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/ic/aacreg.h>
 #include <dev/ic/aacvar.h>
 #include <dev/ic/aac_tables.h>
diff --git a/sys/dev/ic/adv.c b/sys/dev/ic/adv.c
index e4b3ca3ef78b..54932ba059b7 100644
--- a/sys/dev/ic/adv.c
+++ b/sys/dev/ic/adv.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: adv.c,v 1.44 2009/11/23 02:13:46 rmind Exp $	*/
+/*	$NetBSD: adv.c,v 1.45 2010/11/13 13:52:00 uebayasi Exp $	*/
 
 /*
  * Generic driver for the Advanced Systems Inc. Narrow SCSI controllers
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adv.c,v 1.44 2009/11/23 02:13:46 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adv.c,v 1.45 2010/11/13 13:52:00 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -54,8 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: adv.c,v 1.44 2009/11/23 02:13:46 rmind Exp $");
 #include <sys/bus.h>
 #include <sys/intr.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsiconf.h>
diff --git a/sys/dev/ic/advlib.c b/sys/dev/ic/advlib.c
index 56ac8f187929..518d49da5b9d 100644
--- a/sys/dev/ic/advlib.c
+++ b/sys/dev/ic/advlib.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: advlib.c,v 1.26 2007/10/19 11:59:45 ad Exp $        */
+/*      $NetBSD: advlib.c,v 1.27 2010/11/13 13:52:00 uebayasi Exp $        */
 
 /*
  * Low level routines for the Advanced Systems Inc. SCSI controllers chips
@@ -53,7 +53,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: advlib.c,v 1.26 2007/10/19 11:59:45 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advlib.c,v 1.27 2010/11/13 13:52:00 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -69,8 +69,6 @@ __KERNEL_RCSID(0, "$NetBSD: advlib.c,v 1.26 2007/10/19 11:59:45 ad Exp $");
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsiconf.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/ic/advlib.h>
 #include <dev/ic/adv.h>
 #include <dev/ic/advmcode.h>
diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c
index 6e27a1983cf2..4d565d0e60d6 100644
--- a/sys/dev/ic/adw.c
+++ b/sys/dev/ic/adw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adw.c,v 1.50 2009/11/23 02:13:46 rmind Exp $	 */
+/* $NetBSD: adw.c,v 1.51 2010/11/13 13:52:00 uebayasi Exp $	 */
 
 /*
  * Generic driver for the Advanced Systems Inc. SCSI controllers
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adw.c,v 1.50 2009/11/23 02:13:46 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adw.c,v 1.51 2010/11/13 13:52:00 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -54,8 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: adw.c,v 1.50 2009/11/23 02:13:46 rmind Exp $");
 #include <sys/bus.h>
 #include <sys/intr.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsiconf.h>
diff --git a/sys/dev/ic/adwlib.c b/sys/dev/ic/adwlib.c
index 40bf52e84733..dfb21b1f8d90 100644
--- a/sys/dev/ic/adwlib.c
+++ b/sys/dev/ic/adwlib.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adwlib.c,v 1.39 2009/03/14 15:36:17 dsl Exp $        */
+/* $NetBSD: adwlib.c,v 1.40 2010/11/13 13:52:00 uebayasi Exp $        */
 
 /*
  * Low level routines for the Advanced Systems Inc. SCSI controllers chips
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adwlib.c,v 1.39 2009/03/14 15:36:17 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adwlib.c,v 1.40 2010/11/13 13:52:00 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -70,8 +70,6 @@ __KERNEL_RCSID(0, "$NetBSD: adwlib.c,v 1.39 2009/03/14 15:36:17 dsl Exp $");
 
 #include <dev/pci/pcidevs.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/ic/adwlib.h>
 #include <dev/ic/adwmcode.h>
 #include <dev/ic/adw.h>
diff --git a/sys/dev/ic/aha.c b/sys/dev/ic/aha.c
index 612589bc0f89..6a26d6728a4e 100644
--- a/sys/dev/ic/aha.c
+++ b/sys/dev/ic/aha.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: aha.c,v 1.60 2009/11/23 02:13:46 rmind Exp $	*/
+/*	$NetBSD: aha.c,v 1.61 2010/11/13 13:52:00 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aha.c,v 1.60 2009/11/23 02:13:46 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aha.c,v 1.61 2010/11/13 13:52:00 uebayasi Exp $");
 
 #include "opt_ddb.h"
 
@@ -63,8 +63,6 @@ __KERNEL_RCSID(0, "$NetBSD: aha.c,v 1.60 2009/11/23 02:13:46 rmind Exp $");
 #include <sys/buf.h>
 #include <sys/proc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bus.h>
 #include <sys/intr.h>
 
diff --git a/sys/dev/ic/ahcisata_core.c b/sys/dev/ic/ahcisata_core.c
index 178dc9f5da66..cd66fb887b24 100644
--- a/sys/dev/ic/ahcisata_core.c
+++ b/sys/dev/ic/ahcisata_core.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ahcisata_core.c,v 1.29 2010/07/27 22:07:50 jakllsch Exp $	*/
+/*	$NetBSD: ahcisata_core.c,v 1.30 2010/11/13 13:52:00 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.29 2010/07/27 22:07:50 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.30 2010/11/13 13:52:00 uebayasi Exp $");
 
 #include <sys/types.h>
 #include <sys/malloc.h>
@@ -37,8 +37,6 @@ __KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.29 2010/07/27 22:07:50 jakllsch
 #include <sys/proc.h>
 #include <sys/buf.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/ata/atareg.h>
 #include <dev/ata/satavar.h>
 #include <dev/ata/satareg.h>
diff --git a/sys/dev/ic/aic6915.c b/sys/dev/ic/aic6915.c
index 8704da9691e2..ccacba7b73b1 100644
--- a/sys/dev/ic/aic6915.c
+++ b/sys/dev/ic/aic6915.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: aic6915.c,v 1.27 2010/04/05 07:19:33 joerg Exp $	*/
+/*	$NetBSD: aic6915.c,v 1.28 2010/11/13 13:52:00 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic6915.c,v 1.27 2010/04/05 07:19:33 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic6915.c,v 1.28 2010/11/13 13:52:00 uebayasi Exp $");
 
 
 #include <sys/param.h>
@@ -49,8 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: aic6915.c,v 1.27 2010/04/05 07:19:33 joerg Exp $");
 #include <sys/errno.h>
 #include <sys/device.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/ic/aic79xx_osm.h b/sys/dev/ic/aic79xx_osm.h
index 73564f0bac39..b9d3af217f41 100644
--- a/sys/dev/ic/aic79xx_osm.h
+++ b/sys/dev/ic/aic79xx_osm.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: aic79xx_osm.h,v 1.20 2009/09/26 14:44:10 tsutsui Exp $	*/
+/*	$NetBSD: aic79xx_osm.h,v 1.21 2010/11/13 13:52:00 uebayasi Exp $	*/
 
 /*
  * NetBSD platform specific driver option settings, data structures,
@@ -32,9 +32,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $NetBSD: aic79xx_osm.h,v 1.20 2009/09/26 14:44:10 tsutsui Exp $
+ * $NetBSD: aic79xx_osm.h,v 1.21 2010/11/13 13:52:00 uebayasi Exp $
  *
- * //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.h#19 $$NetBSD: aic79xx_osm.h,v 1.20 2009/09/26 14:44:10 tsutsui Exp $
+ * //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.h#19 $$NetBSD: aic79xx_osm.h,v 1.21 2010/11/13 13:52:00 uebayasi Exp $
  *
  * $FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.h,v 1.9 2003/05/26 21:43:29 gibbs Exp $
  */
@@ -72,8 +72,6 @@
 #include <dev/scsipi/scsiconf.h>
 #include <dev/scsipi/scsi_iu.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/ic/aic7xxx_cam.h>
 
 /****************************** Platform Macros *******************************/
diff --git a/sys/dev/ic/aic7xxx_osm.h b/sys/dev/ic/aic7xxx_osm.h
index 2ae0cf03e134..57fc92efc7a9 100644
--- a/sys/dev/ic/aic7xxx_osm.h
+++ b/sys/dev/ic/aic7xxx_osm.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: aic7xxx_osm.h,v 1.24 2009/05/16 06:44:05 tsutsui Exp $	*/
+/*	$NetBSD: aic7xxx_osm.h,v 1.25 2010/11/13 13:52:00 uebayasi Exp $	*/
 
 /*
  * NetBSD platform specific driver option settings, data structures,
@@ -68,8 +68,6 @@
 #include <dev/scsipi/scsiconf.h>
 #include <dev/scsipi/scsi_iu.h>
 
-#include <uvm/uvm_extern.h>
-
 #ifdef CAM_NEW_TRAN_CODE
 #define AHC_NEW_TRAN_SETTINGS
 #endif /* CAM_NEW_TRAN_CODE */
diff --git a/sys/dev/ic/bha.c b/sys/dev/ic/bha.c
index fc8ec69e864c..b904ba96e5e6 100644
--- a/sys/dev/ic/bha.c
+++ b/sys/dev/ic/bha.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bha.c,v 1.73 2010/07/27 14:34:34 jakllsch Exp $	*/
+/*	$NetBSD: bha.c,v 1.74 2010/11/13 13:52:00 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bha.c,v 1.73 2010/07/27 14:34:34 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bha.c,v 1.74 2010/11/13 13:52:00 uebayasi Exp $");
 
 #include "opt_ddb.h"
 
@@ -61,8 +61,6 @@ __KERNEL_RCSID(0, "$NetBSD: bha.c,v 1.73 2010/07/27 14:34:34 jakllsch Exp $");
 #include <sys/buf.h>
 #include <sys/proc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bus.h>
 #include <sys/intr.h>
 
diff --git a/sys/dev/ic/bt463.c b/sys/dev/ic/bt463.c
index dabeeced940d..b3adc19a51db 100644
--- a/sys/dev/ic/bt463.c
+++ b/sys/dev/ic/bt463.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bt463.c,v 1.14 2009/03/14 15:36:17 dsl Exp $ */
+/* $NetBSD: bt463.c,v 1.15 2010/11/13 13:52:00 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
   */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bt463.c,v 1.14 2009/03/14 15:36:17 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bt463.c,v 1.15 2010/11/13 13:52:00 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -71,8 +71,6 @@ __KERNEL_RCSID(0, "$NetBSD: bt463.c,v 1.14 2009/03/14 15:36:17 dsl Exp $");
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/pci/pcivar.h>
 #include <dev/pci/tgareg.h>
 #include <dev/pci/tgavar.h>
diff --git a/sys/dev/ic/bt485.c b/sys/dev/ic/bt485.c
index 86846205e10d..42a2c4e8771d 100644
--- a/sys/dev/ic/bt485.c
+++ b/sys/dev/ic/bt485.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bt485.c,v 1.14 2009/03/14 15:36:17 dsl Exp $ */
+/* $NetBSD: bt485.c,v 1.15 2010/11/13 13:52:00 uebayasi Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -32,7 +32,7 @@
   */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bt485.c,v 1.14 2009/03/14 15:36:17 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bt485.c,v 1.15 2010/11/13 13:52:00 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -41,8 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: bt485.c,v 1.14 2009/03/14 15:36:17 dsl Exp $");
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/pci/pcivar.h>
 #include <dev/ic/bt485reg.h>
 #include <dev/ic/bt485var.h>
diff --git a/sys/dev/ic/cac.c b/sys/dev/ic/cac.c
index 5c869ed8753d..49b6605702e6 100644
--- a/sys/dev/ic/cac.c
+++ b/sys/dev/ic/cac.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cac.c,v 1.50 2010/03/14 18:06:28 pgoyette Exp $	*/
+/*	$NetBSD: cac.c,v 1.51 2010/11/13 13:52:00 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2006, 2007 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cac.c,v 1.50 2010/03/14 18:06:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cac.c,v 1.51 2010/11/13 13:52:00 uebayasi Exp $");
 
 #include "bio.h"
 
@@ -49,8 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: cac.c,v 1.50 2010/03/14 18:06:28 pgoyette Exp $");
 #include <sys/malloc.h>
 #include <sys/pool.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bswap.h>
 #include <sys/bus.h>
 
diff --git a/sys/dev/ic/ciss.c b/sys/dev/ic/ciss.c
index 57d665009655..878f1a573829 100644
--- a/sys/dev/ic/ciss.c
+++ b/sys/dev/ic/ciss.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ciss.c,v 1.23 2010/09/07 18:19:16 mhitch Exp $	*/
+/*	$NetBSD: ciss.c,v 1.24 2010/11/13 13:52:00 uebayasi Exp $	*/
 /*	$OpenBSD: ciss.c,v 1.14 2006/03/13 16:02:23 mickey Exp $	*/
 
 /*
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.23 2010/09/07 18:19:16 mhitch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.24 2010/11/13 13:52:00 uebayasi Exp $");
 
 #include "bio.h"
 
@@ -34,8 +34,6 @@ __KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.23 2010/09/07 18:19:16 mhitch Exp $");
 #include <sys/malloc.h>
 #include <sys/proc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bus.h>
 
 #include <dev/scsipi/scsi_all.h>
diff --git a/sys/dev/ic/cs89x0.c b/sys/dev/ic/cs89x0.c
index 80709df371aa..237bfb5a3ddd 100644
--- a/sys/dev/ic/cs89x0.c
+++ b/sys/dev/ic/cs89x0.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cs89x0.c,v 1.31 2010/04/05 07:19:33 joerg Exp $	*/
+/*	$NetBSD: cs89x0.c,v 1.32 2010/11/13 13:52:00 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2004 Christopher Gilbert
@@ -212,7 +212,7 @@
 */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs89x0.c,v 1.31 2010/04/05 07:19:33 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs89x0.c,v 1.32 2010/11/13 13:52:00 uebayasi Exp $");
 
 #include "opt_inet.h"
 
@@ -242,8 +242,6 @@ __KERNEL_RCSID(0, "$NetBSD: cs89x0.c,v 1.31 2010/04/05 07:19:33 joerg Exp $");
 #include <net/bpf.h>
 #include <net/bpfdesc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bus.h>
 #include <sys/intr.h>
 
diff --git a/sys/dev/ic/dp83932.c b/sys/dev/ic/dp83932.c
index 22926f8c921d..bc4eb1e39c57 100644
--- a/sys/dev/ic/dp83932.c
+++ b/sys/dev/ic/dp83932.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dp83932.c,v 1.34 2010/04/05 07:19:34 joerg Exp $	*/
+/*	$NetBSD: dp83932.c,v 1.35 2010/11/13 13:52:00 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dp83932.c,v 1.34 2010/04/05 07:19:34 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dp83932.c,v 1.35 2010/11/13 13:52:00 uebayasi Exp $");
 
 
 #include <sys/param.h>
@@ -48,8 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: dp83932.c,v 1.34 2010/04/05 07:19:34 joerg Exp $");
 #include <sys/errno.h>
 #include <sys/device.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_ether.h>
diff --git a/sys/dev/ic/dpt.c b/sys/dev/ic/dpt.c
index b26e1d748b48..735203031f72 100644
--- a/sys/dev/ic/dpt.c
+++ b/sys/dev/ic/dpt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dpt.c,v 1.63 2009/10/21 21:12:05 rmind Exp $	*/
+/*	$NetBSD: dpt.c,v 1.64 2010/11/13 13:52:01 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpt.c,v 1.63 2009/10/21 21:12:05 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpt.c,v 1.64 2010/11/13 13:52:01 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -83,8 +83,6 @@ __KERNEL_RCSID(0, "$NetBSD: dpt.c,v 1.63 2009/10/21 21:12:05 rmind Exp $");
 #include <sys/kauth.h>
 #include <sys/proc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bus.h>
 #ifdef i386
 #include <machine/pio.h>
diff --git a/sys/dev/ic/elinkxl.c b/sys/dev/ic/elinkxl.c
index 8b5ecaa64d15..c0e90d0cc077 100644
--- a/sys/dev/ic/elinkxl.c
+++ b/sys/dev/ic/elinkxl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: elinkxl.c,v 1.112 2010/04/05 07:19:34 joerg Exp $	*/
+/*	$NetBSD: elinkxl.c,v 1.113 2010/11/13 13:52:01 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.112 2010/04/05 07:19:34 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.113 2010/11/13 13:52:01 uebayasi Exp $");
 
 #include "rnd.h"
 
@@ -49,8 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.112 2010/04/05 07:19:34 joerg Exp $");
 #include <sys/rnd.h>
 #endif
 
-#include <uvm/uvm_extern.h>
-
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_ether.h>
diff --git a/sys/dev/ic/esiop.c b/sys/dev/ic/esiop.c
index 4109f45a43d7..d3f45611baff 100644
--- a/sys/dev/ic/esiop.c
+++ b/sys/dev/ic/esiop.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: esiop.c,v 1.54 2010/09/09 14:50:25 jakllsch Exp $	*/
+/*	$NetBSD: esiop.c,v 1.55 2010/11/13 13:52:01 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2002 Manuel Bouyer.
@@ -28,7 +28,7 @@
 /* SYM53c7/8xx PCI-SCSI I/O Processors driver */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.54 2010/09/09 14:50:25 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.55 2010/11/13 13:52:01 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -37,8 +37,6 @@ __KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.54 2010/09/09 14:50:25 jakllsch Exp $");
 #include <sys/buf.h>
 #include <sys/kernel.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <machine/endian.h>
 #include <sys/bus.h>
 
diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c
index 687321a24e02..c8536c3ccbdd 100644
--- a/sys/dev/ic/gem.c
+++ b/sys/dev/ic/gem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gem.c,v 1.95 2010/05/12 10:25:23 martin Exp $ */
+/*	$NetBSD: gem.c,v 1.96 2010/11/13 13:52:01 uebayasi Exp $ */
 
 /*
  *
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.95 2010/05/12 10:25:23 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.96 2010/11/13 13:52:01 uebayasi Exp $");
 
 #include "opt_inet.h"
 
@@ -55,8 +55,6 @@ __KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.95 2010/05/12 10:25:23 martin Exp $");
 
 #include <machine/endian.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/ic/hd44780_subr.c b/sys/dev/ic/hd44780_subr.c
index 75bed83d485a..dc6acea58e63 100644
--- a/sys/dev/ic/hd44780_subr.c
+++ b/sys/dev/ic/hd44780_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hd44780_subr.c,v 1.20 2009/08/30 02:07:05 tsutsui Exp $ */
+/* $NetBSD: hd44780_subr.c,v 1.21 2010/11/13 13:52:01 uebayasi Exp $ */
 
 /*
  * Copyright (c) 2002 Dennis I. Chernoivanov
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd44780_subr.c,v 1.20 2009/08/30 02:07:05 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd44780_subr.c,v 1.21 2010/11/13 13:52:01 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -46,8 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: hd44780_subr.c,v 1.20 2009/08/30 02:07:05 tsutsui Ex
 #include <sys/intr.h>
 #include <sys/bus.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wscons_callbacks.h>
diff --git a/sys/dev/ic/ibm561.c b/sys/dev/ic/ibm561.c
index 368b747936da..d854c087c21a 100644
--- a/sys/dev/ic/ibm561.c
+++ b/sys/dev/ic/ibm561.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ibm561.c,v 1.9 2009/03/14 15:36:17 dsl Exp $ */
+/* $NetBSD: ibm561.c,v 1.10 2010/11/13 13:52:01 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibm561.c,v 1.9 2009/03/14 15:36:17 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibm561.c,v 1.10 2010/11/13 13:52:01 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -39,8 +39,6 @@ __KERNEL_RCSID(0, "$NetBSD: ibm561.c,v 1.9 2009/03/14 15:36:17 dsl Exp $");
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/pci/pcivar.h>
 #include <dev/ic/ibm561reg.h>
 #include <dev/ic/ibm561var.h>
diff --git a/sys/dev/ic/icp.c b/sys/dev/ic/icp.c
index 7629138ea1fb..7fc6607a94ab 100644
--- a/sys/dev/ic/icp.c
+++ b/sys/dev/ic/icp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: icp.c,v 1.29 2008/04/30 14:07:13 ad Exp $	*/
+/*	$NetBSD: icp.c,v 1.30 2010/11/13 13:52:01 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icp.c,v 1.29 2008/04/30 14:07:13 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icp.c,v 1.30 2010/11/13 13:52:01 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -89,8 +89,6 @@ __KERNEL_RCSID(0, "$NetBSD: icp.c,v 1.29 2008/04/30 14:07:13 ad Exp $");
 #include <sys/malloc.h>
 #include <sys/disk.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bswap.h>
 #include <sys/bus.h>
 
diff --git a/sys/dev/ic/icpsp.c b/sys/dev/ic/icpsp.c
index 8f250eff1de8..02a1e344eec6 100644
--- a/sys/dev/ic/icpsp.c
+++ b/sys/dev/ic/icpsp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: icpsp.c,v 1.23 2009/05/12 14:25:17 cegger Exp $	*/
+/*	$NetBSD: icpsp.c,v 1.24 2010/11/13 13:52:01 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icpsp.c,v 1.23 2009/05/12 14:25:17 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icpsp.c,v 1.24 2010/11/13 13:52:01 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -46,8 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: icpsp.c,v 1.23 2009/05/12 14:25:17 cegger Exp $");
 #include <sys/bswap.h>
 #include <sys/bus.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsi_disk.h>
 #include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/ic/iha.c b/sys/dev/ic/iha.c
index 6109d933cf59..74e1be9b1748 100644
--- a/sys/dev/ic/iha.c
+++ b/sys/dev/ic/iha.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iha.c,v 1.40 2008/05/14 13:29:28 tsutsui Exp $ */
+/*	$NetBSD: iha.c,v 1.41 2010/11/13 13:52:01 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 2001, 2002 Izumi Tsutsui
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iha.c,v 1.40 2008/05/14 13:29:28 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iha.c,v 1.41 2010/11/13 13:52:01 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -71,8 +71,6 @@ __KERNEL_RCSID(0, "$NetBSD: iha.c,v 1.40 2008/05/14 13:29:28 tsutsui Exp $");
 #include <sys/device.h>
 #include <sys/malloc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bus.h>
 #include <sys/intr.h>
 
diff --git a/sys/dev/ic/ld_aac.c b/sys/dev/ic/ld_aac.c
index 4473add3902e..fe185b39fcc6 100644
--- a/sys/dev/ic/ld_aac.c
+++ b/sys/dev/ic/ld_aac.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ld_aac.c,v 1.24 2010/07/27 19:31:55 jakllsch Exp $	*/
+/*	$NetBSD: ld_aac.c,v 1.25 2010/11/13 13:52:01 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_aac.c,v 1.24 2010/07/27 19:31:55 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_aac.c,v 1.25 2010/11/13 13:52:01 uebayasi Exp $");
 
 #include "rnd.h"
 
@@ -49,8 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: ld_aac.c,v 1.24 2010/07/27 19:31:55 jakllsch Exp $")
 
 #include <sys/bus.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/ldvar.h>
 
 #include <dev/ic/aacreg.h>
diff --git a/sys/dev/ic/ld_icp.c b/sys/dev/ic/ld_icp.c
index 7a87a8bfac2a..bdeeb7fa1e5d 100644
--- a/sys/dev/ic/ld_icp.c
+++ b/sys/dev/ic/ld_icp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ld_icp.c,v 1.23 2009/01/29 12:14:40 bouyer Exp $	*/
+/*	$NetBSD: ld_icp.c,v 1.24 2010/11/13 13:52:01 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_icp.c,v 1.23 2009/01/29 12:14:40 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_icp.c,v 1.24 2010/11/13 13:52:01 uebayasi Exp $");
 
 #include "rnd.h"
 
@@ -51,8 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: ld_icp.c,v 1.23 2009/01/29 12:14:40 bouyer Exp $");
 #include <sys/rnd.h>
 #endif
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bus.h>
 
 #include <dev/ldvar.h>
diff --git a/sys/dev/ic/lemac.c b/sys/dev/ic/lemac.c
index 3bb47c6838db..62fce6e70639 100644
--- a/sys/dev/ic/lemac.c
+++ b/sys/dev/ic/lemac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lemac.c,v 1.38 2010/04/05 07:19:35 joerg Exp $ */
+/* $NetBSD: lemac.c,v 1.39 2010/11/13 13:52:01 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 1994, 1995, 1997 Matt Thomas <matt@3am-software.com>
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lemac.c,v 1.38 2010/04/05 07:19:35 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lemac.c,v 1.39 2010/11/13 13:52:01 uebayasi Exp $");
 
 #include "opt_inet.h"
 #include "rnd.h"
@@ -76,8 +76,6 @@ __KERNEL_RCSID(0, "$NetBSD: lemac.c,v 1.38 2010/04/05 07:19:35 joerg Exp $");
 #include <i386/isa/decether.h>
 #endif
 
-#include <uvm/uvm_extern.h>
-
 #include <net/bpf.h>
 
 static void lemac_init(lemac_softc_t *sc);
diff --git a/sys/dev/ic/lsi64854.c b/sys/dev/ic/lsi64854.c
index 5c950b6cf610..940ae84d340e 100644
--- a/sys/dev/ic/lsi64854.c
+++ b/sys/dev/ic/lsi64854.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lsi64854.c,v 1.34 2008/12/16 22:35:31 christos Exp $ */
+/*	$NetBSD: lsi64854.c,v 1.35 2010/11/13 13:52:01 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lsi64854.c,v 1.34 2008/12/16 22:35:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lsi64854.c,v 1.35 2010/11/13 13:52:01 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -39,8 +39,6 @@ __KERNEL_RCSID(0, "$NetBSD: lsi64854.c,v 1.34 2008/12/16 22:35:31 christos Exp $
 #include <sys/device.h>
 #include <sys/malloc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <sys/cpu.h>
diff --git a/sys/dev/ic/mlx.c b/sys/dev/ic/mlx.c
index f9b1ed0cadd1..a837e210ac91 100644
--- a/sys/dev/ic/mlx.c
+++ b/sys/dev/ic/mlx.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mlx.c,v 1.58 2009/01/16 05:40:50 mhitch Exp $	*/
+/*	$NetBSD: mlx.c,v 1.59 2010/11/13 13:52:01 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.58 2009/01/16 05:40:50 mhitch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.59 2010/11/13 13:52:01 uebayasi Exp $");
 
 #include "ld.h"
 
@@ -89,8 +89,6 @@ __KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.58 2009/01/16 05:40:50 mhitch Exp $");
 #include <machine/vmparam.h>
 #include <sys/bus.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/ldvar.h>
 
 #include <dev/ic/mlxreg.h>
diff --git a/sys/dev/ic/mpt_netbsd.h b/sys/dev/ic/mpt_netbsd.h
index 77a753d32c65..bf88e6f562b0 100644
--- a/sys/dev/ic/mpt_netbsd.h
+++ b/sys/dev/ic/mpt_netbsd.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: mpt_netbsd.h,v 1.8 2007/11/20 14:33:58 ad Exp $	*/
+/*	$NetBSD: mpt_netbsd.h,v 1.9 2010/11/13 13:52:01 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -87,8 +87,6 @@
 #include <sys/queue.h>
 #include <sys/device.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bus.h>
 #include <sys/intr.h>
 
diff --git a/sys/dev/ic/ninjaata32.c b/sys/dev/ic/ninjaata32.c
index 799719c10ae7..49557bfa3f89 100644
--- a/sys/dev/ic/ninjaata32.c
+++ b/sys/dev/ic/ninjaata32.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ninjaata32.c,v 1.11 2009/03/14 15:36:17 dsl Exp $	*/
+/*	$NetBSD: ninjaata32.c,v 1.12 2010/11/13 13:52:01 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2006 ITOH Yasufumi <itohy@NetBSD.org>.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ninjaata32.c,v 1.11 2009/03/14 15:36:17 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ninjaata32.c,v 1.12 2010/11/13 13:52:01 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -37,8 +37,6 @@ __KERNEL_RCSID(0, "$NetBSD: ninjaata32.c,v 1.11 2009/03/14 15:36:17 dsl Exp $");
 #include <sys/bus.h>
 #include <sys/intr.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/ata/atavar.h>
 #include <dev/ic/wdcreg.h>
 #include <dev/ic/wdcvar.h>
diff --git a/sys/dev/ic/ninjascsi32.c b/sys/dev/ic/ninjascsi32.c
index bfcca4e82d71..c08794e46e68 100644
--- a/sys/dev/ic/ninjascsi32.c
+++ b/sys/dev/ic/ninjascsi32.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ninjascsi32.c,v 1.20 2009/05/16 05:51:58 tsutsui Exp $	*/
+/*	$NetBSD: ninjascsi32.c,v 1.21 2010/11/13 13:52:01 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ninjascsi32.c,v 1.20 2009/05/16 05:51:58 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ninjascsi32.c,v 1.21 2010/11/13 13:52:01 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -44,8 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: ninjascsi32.c,v 1.20 2009/05/16 05:51:58 tsutsui Exp
 #include <sys/bus.h>
 #include <sys/intr.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsiconf.h>
diff --git a/sys/dev/ic/oosiop.c b/sys/dev/ic/oosiop.c
index f696bf8fcaeb..3940b182c7f0 100644
--- a/sys/dev/ic/oosiop.c
+++ b/sys/dev/ic/oosiop.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: oosiop.c,v 1.12 2008/03/29 09:11:35 tsutsui Exp $	*/
+/*	$NetBSD: oosiop.c,v 1.13 2010/11/13 13:52:02 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2001 Shuichiro URATA.  All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oosiop.c,v 1.12 2008/03/29 09:11:35 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oosiop.c,v 1.13 2010/11/13 13:52:02 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -46,8 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: oosiop.c,v 1.12 2008/03/29 09:11:35 tsutsui Exp $");
 #include <sys/malloc.h>
 #include <sys/queue.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsiconf.h>
diff --git a/sys/dev/ic/osiop.c b/sys/dev/ic/osiop.c
index 8126bb061e6c..916951db37c0 100644
--- a/sys/dev/ic/osiop.c
+++ b/sys/dev/ic/osiop.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: osiop.c,v 1.38 2010/05/04 15:38:04 tsutsui Exp $	*/
+/*	$NetBSD: osiop.c,v 1.39 2010/11/13 13:52:02 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2001 Izumi Tsutsui.  All rights reserved.
@@ -95,7 +95,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osiop.c,v 1.38 2010/05/04 15:38:04 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osiop.c,v 1.39 2010/11/13 13:52:02 uebayasi Exp $");
 
 /* #define OSIOP_DEBUG */
 
@@ -108,8 +108,6 @@ __KERNEL_RCSID(0, "$NetBSD: osiop.c,v 1.38 2010/05/04 15:38:04 tsutsui Exp $");
 #include <sys/buf.h>
 #include <sys/kernel.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsiconf.h>
diff --git a/sys/dev/ic/pdqvar.h b/sys/dev/ic/pdqvar.h
index f7110f2c2556..ee03d1b0359b 100644
--- a/sys/dev/ic/pdqvar.h
+++ b/sys/dev/ic/pdqvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pdqvar.h,v 1.45 2010/04/05 07:19:35 joerg Exp $	*/
+/*	$NetBSD: pdqvar.h,v 1.46 2010/11/13 13:52:02 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@@ -85,8 +85,6 @@ typedef enum _pdq_state_t pdq_state_t;
 #endif /* M_CAST */
 #include <sys/malloc.h>
 
-#include <uvm/uvm_extern.h>
-
 #define	PDQ_USE_MBUFS
 #if defined(__NetBSD__)
 #define	PDQ_OS_PREFIX			"%s: "
diff --git a/sys/dev/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c
index 9ff785cd0504..b06623fb77be 100644
--- a/sys/dev/ic/rtl81x9.c
+++ b/sys/dev/ic/rtl81x9.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtl81x9.c,v 1.91 2010/07/27 21:02:00 jakllsch Exp $	*/
+/*	$NetBSD: rtl81x9.c,v 1.92 2010/11/13 13:52:02 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -86,7 +86,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.91 2010/07/27 21:02:00 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.92 2010/11/13 13:52:02 uebayasi Exp $");
 
 #include "rnd.h"
 
@@ -100,8 +100,6 @@ __KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.91 2010/07/27 21:02:00 jakllsch Exp $"
 #include <sys/kernel.h>
 #include <sys/socket.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <net/if_ether.h>
diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c
index 4caf374dfc66..9f2740add3f5 100644
--- a/sys/dev/ic/rtw.c
+++ b/sys/dev/ic/rtw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtw.c,v 1.116 2010/04/05 07:19:36 joerg Exp $ */
+/* $NetBSD: rtw.c,v 1.117 2010/11/13 13:52:02 uebayasi Exp $ */
 /*-
  * Copyright (c) 2004, 2005, 2006, 2007 David Young.  All rights
  * reserved.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.116 2010/04/05 07:19:36 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.117 2010/11/13 13:52:02 uebayasi Exp $");
 
 
 #include <sys/param.h>
@@ -50,8 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.116 2010/04/05 07:19:36 joerg Exp $");
 #include <sys/bus.h>
 #include <sys/intr.h>	/* splnet */
 
-#include <uvm/uvm_extern.h>
-
 #include <net/if.h>
 #include <net/if_media.h>
 #include <net/if_ether.h>
diff --git a/sys/dev/ic/sgec.c b/sys/dev/ic/sgec.c
index bb06bf52e7de..12d450aace60 100644
--- a/sys/dev/ic/sgec.c
+++ b/sys/dev/ic/sgec.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: sgec.c,v 1.38 2010/04/05 07:19:36 joerg Exp $ */
+/*      $NetBSD: sgec.c,v 1.39 2010/11/13 13:52:02 uebayasi Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
  *
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sgec.c,v 1.38 2010/04/05 07:19:36 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sgec.c,v 1.39 2010/11/13 13:52:02 uebayasi Exp $");
 
 #include "opt_inet.h"
 
@@ -56,8 +56,6 @@ __KERNEL_RCSID(0, "$NetBSD: sgec.c,v 1.38 2010/04/05 07:19:36 joerg Exp $");
 #include <sys/systm.h>
 #include <sys/sockio.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <net/if.h>
 #include <net/if_ether.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/ic/siop.c b/sys/dev/ic/siop.c
index 2fe6224ae22b..22ac3f41b682 100644
--- a/sys/dev/ic/siop.c
+++ b/sys/dev/ic/siop.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: siop.c,v 1.97 2010/09/09 14:50:25 jakllsch Exp $	*/
+/*	$NetBSD: siop.c,v 1.98 2010/11/13 13:52:02 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2000 Manuel Bouyer.
@@ -28,7 +28,7 @@
 /* SYM53c7/8xx PCI-SCSI I/O Processors driver */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.97 2010/09/09 14:50:25 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.98 2010/11/13 13:52:02 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -37,8 +37,6 @@ __KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.97 2010/09/09 14:50:25 jakllsch Exp $");
 #include <sys/buf.h>
 #include <sys/kernel.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <machine/endian.h>
 #include <sys/bus.h>
 
diff --git a/sys/dev/ic/siop_common.c b/sys/dev/ic/siop_common.c
index c2d3077ec27c..672b86c51985 100644
--- a/sys/dev/ic/siop_common.c
+++ b/sys/dev/ic/siop_common.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: siop_common.c,v 1.52 2009/10/19 18:41:13 bouyer Exp $	*/
+/*	$NetBSD: siop_common.c,v 1.53 2010/11/13 13:52:02 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2000, 2002 Manuel Bouyer.
@@ -28,7 +28,7 @@
 /* SYM53c7/8xx PCI-SCSI I/O Processors driver */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop_common.c,v 1.52 2009/10/19 18:41:13 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop_common.c,v 1.53 2010/11/13 13:52:02 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -38,8 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: siop_common.c,v 1.52 2009/10/19 18:41:13 bouyer Exp
 #include <sys/kernel.h>
 #include <sys/scsiio.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <machine/endian.h>
 #include <sys/bus.h>
 
diff --git a/sys/dev/ic/smc83c170.c b/sys/dev/ic/smc83c170.c
index 3ab73ee5a624..c047d7cf25e7 100644
--- a/sys/dev/ic/smc83c170.c
+++ b/sys/dev/ic/smc83c170.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: smc83c170.c,v 1.79 2010/04/05 07:19:36 joerg Exp $	*/
+/*	$NetBSD: smc83c170.c,v 1.80 2010/11/13 13:52:02 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc83c170.c,v 1.79 2010/04/05 07:19:36 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc83c170.c,v 1.80 2010/11/13 13:52:02 uebayasi Exp $");
 
 
 #include <sys/param.h>
@@ -50,8 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: smc83c170.c,v 1.79 2010/04/05 07:19:36 joerg Exp $")
 #include <sys/errno.h>
 #include <sys/device.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/ic/smc91cxx.c b/sys/dev/ic/smc91cxx.c
index ac923f4669b3..76ae86ce08dd 100644
--- a/sys/dev/ic/smc91cxx.c
+++ b/sys/dev/ic/smc91cxx.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: smc91cxx.c,v 1.78 2010/04/05 07:19:37 joerg Exp $	*/
+/*	$NetBSD: smc91cxx.c,v 1.79 2010/11/13 13:52:02 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.78 2010/04/05 07:19:37 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.79 2010/11/13 13:52:02 uebayasi Exp $");
 
 #include "opt_inet.h"
 #include "rnd.h"
@@ -93,8 +93,6 @@ __KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.78 2010/04/05 07:19:37 joerg Exp $");
 #include <sys/bus.h>
 #include <sys/intr.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_ether.h>
diff --git a/sys/dev/ic/tulip.c b/sys/dev/ic/tulip.c
index 418d899bb7ef..4a285aadffad 100644
--- a/sys/dev/ic/tulip.c
+++ b/sys/dev/ic/tulip.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tulip.c,v 1.175 2010/04/05 07:19:37 joerg Exp $	*/
+/*	$NetBSD: tulip.c,v 1.176 2010/11/13 13:52:02 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.175 2010/04/05 07:19:37 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.176 2010/11/13 13:52:02 uebayasi Exp $");
 
 
 #include <sys/param.h>
@@ -52,8 +52,6 @@ __KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.175 2010/04/05 07:19:37 joerg Exp $");
 
 #include <machine/endian.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/ic/uha.c b/sys/dev/ic/uha.c
index c1b3e1c4b88f..b051cc53f4c4 100644
--- a/sys/dev/ic/uha.c
+++ b/sys/dev/ic/uha.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uha.c,v 1.44 2009/11/23 02:13:46 rmind Exp $	*/
+/*	$NetBSD: uha.c,v 1.45 2010/11/13 13:52:02 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uha.c,v 1.44 2009/11/23 02:13:46 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uha.c,v 1.45 2010/11/13 13:52:02 uebayasi Exp $");
 
 #undef UHADEBUG
 #ifdef DDB
@@ -72,8 +72,6 @@ __KERNEL_RCSID(0, "$NetBSD: uha.c,v 1.44 2009/11/23 02:13:46 rmind Exp $");
 #include <sys/buf.h>
 #include <sys/proc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bus.h>
 #include <sys/intr.h>
 
diff --git a/sys/dev/ic/wd33c93.c b/sys/dev/ic/wd33c93.c
index c2631b2d0271..2d2c991fd93d 100644
--- a/sys/dev/ic/wd33c93.c
+++ b/sys/dev/ic/wd33c93.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wd33c93.c,v 1.23 2009/02/12 06:20:58 rumble Exp $	*/
+/*	$NetBSD: wd33c93.c,v 1.24 2010/11/13 13:52:02 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd33c93.c,v 1.23 2009/02/12 06:20:58 rumble Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd33c93.c,v 1.24 2010/11/13 13:52:02 uebayasi Exp $");
 
 #include "opt_ddb.h"
 
@@ -95,8 +95,6 @@ __KERNEL_RCSID(0, "$NetBSD: wd33c93.c,v 1.23 2009/02/12 06:20:58 rumble Exp $");
 #include <dev/scsipi/scsiconf.h>
 #include <dev/scsipi/scsi_message.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bus.h>
 
 #include <dev/ic/wd33c93reg.h>
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index 3dac376fc5fc..8f02def8b1e3 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fd.c,v 1.98 2010/08/11 11:35:08 pgoyette Exp $	*/
+/*	$NetBSD: fd.c,v 1.99 2010/11/13 13:52:03 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2003, 2008 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.98 2010/08/11 11:35:08 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.99 2010/11/13 13:52:03 uebayasi Exp $");
 
 #include "rnd.h"
 #include "opt_ddb.h"
@@ -122,8 +122,6 @@ __KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.98 2010/08/11 11:35:08 pgoyette Exp $");
 
 #include <prop/proplib.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/cons.h>
 
 #include <sys/cpu.h>
diff --git a/sys/dev/isa/if_le_isa.c b/sys/dev/isa/if_le_isa.c
index 5ddc8469a794..e44d043dce93 100644
--- a/sys/dev/isa/if_le_isa.c
+++ b/sys/dev/isa/if_le_isa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_le_isa.c,v 1.48 2009/05/12 09:10:15 cegger Exp $	*/
+/*	$NetBSD: if_le_isa.c,v 1.49 2010/11/13 13:52:03 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_isa.c,v 1.48 2009/05/12 09:10:15 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_isa.c,v 1.49 2010/11/13 13:52:03 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -74,8 +74,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_isa.c,v 1.48 2009/05/12 09:10:15 cegger Exp $"
 #include <sys/socket.h>
 #include <sys/device.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <net/if.h>
 #include <net/if_ether.h>
 #include <net/if_media.h>
diff --git a/sys/dev/isa/isadma.c b/sys/dev/isa/isadma.c
index 8b07fd7be869..7e41c16829f4 100644
--- a/sys/dev/isa/isadma.c
+++ b/sys/dev/isa/isadma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: isadma.c,v 1.65 2010/07/26 22:33:24 jym Exp $	*/
+/*	$NetBSD: isadma.c,v 1.66 2010/11/13 13:52:03 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1.65 2010/07/26 22:33:24 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1.66 2010/11/13 13:52:03 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -45,8 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1.65 2010/07/26 22:33:24 jym Exp $");
 
 #include <sys/bus.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/isa/isareg.h>
 #include <dev/isa/isavar.h>
 #include <dev/isa/isadmavar.h>
diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c
index 438313a9396d..3eb7746b67a1 100644
--- a/sys/dev/isa/wds.c
+++ b/sys/dev/isa/wds.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wds.c,v 1.74 2009/11/23 02:13:47 rmind Exp $	*/
+/*	$NetBSD: wds.c,v 1.75 2010/11/13 13:52:03 uebayasi Exp $	*/
 
 /*
  * XXX
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wds.c,v 1.74 2009/11/23 02:13:47 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wds.c,v 1.75 2010/11/13 13:52:03 uebayasi Exp $");
 
 #include "opt_ddb.h"
 
@@ -100,8 +100,6 @@ __KERNEL_RCSID(0, "$NetBSD: wds.c,v 1.74 2009/11/23 02:13:47 rmind Exp $");
 #include <sys/buf.h>
 #include <sys/proc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bus.h>
 #include <sys/intr.h>
 
diff --git a/sys/dev/isapnp/if_le_isapnp.c b/sys/dev/isapnp/if_le_isapnp.c
index 586b16cc7422..cf07644e2355 100644
--- a/sys/dev/isapnp/if_le_isapnp.c
+++ b/sys/dev/isapnp/if_le_isapnp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_le_isapnp.c,v 1.34 2008/04/28 20:23:53 martin Exp $	*/
+/*	$NetBSD: if_le_isapnp.c,v 1.35 2010/11/13 13:52:03 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_isapnp.c,v 1.34 2008/04/28 20:23:53 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_isapnp.c,v 1.35 2010/11/13 13:52:03 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -73,8 +73,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_isapnp.c,v 1.34 2008/04/28 20:23:53 martin Exp
 #include <sys/select.h>
 #include <sys/device.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_ether.h>
diff --git a/sys/dev/marvell/gtmpsc.c b/sys/dev/marvell/gtmpsc.c
index 5c8ddb5ba6f7..7d91aacf8f95 100644
--- a/sys/dev/marvell/gtmpsc.c
+++ b/sys/dev/marvell/gtmpsc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gtmpsc.c,v 1.40 2010/08/01 06:57:06 kiyohara Exp $	*/
+/*	$NetBSD: gtmpsc.c,v 1.41 2010/11/13 13:52:03 uebayasi Exp $	*/
 /*
  * Copyright (c) 2009 KIYOHARA Takashi
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtmpsc.c,v 1.40 2010/08/01 06:57:06 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtmpsc.c,v 1.41 2010/11/13 13:52:03 uebayasi Exp $");
 
 #include "opt_kgdb.h"
 
@@ -51,8 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: gtmpsc.c,v 1.40 2010/08/01 06:57:06 kiyohara Exp $")
 #endif
 
 #include <uvm/uvm.h>
-#include <uvm/uvm_extern.h>
-
 #include <dev/cons.h>
 
 #include <dev/marvell/gtreg.h>
diff --git a/sys/dev/marvell/if_gfe.c b/sys/dev/marvell/if_gfe.c
index 4bc20449704f..7d0262209251 100644
--- a/sys/dev/marvell/if_gfe.c
+++ b/sys/dev/marvell/if_gfe.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_gfe.c,v 1.38 2010/08/01 06:57:06 kiyohara Exp $	*/
+/*	$NetBSD: if_gfe.c,v 1.39 2010/11/13 13:52:04 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.38 2010/08/01 06:57:06 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.39 2010/11/13 13:52:04 uebayasi Exp $");
 
 #include "opt_inet.h"
 #include "rnd.h"
@@ -58,8 +58,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.38 2010/08/01 06:57:06 kiyohara Exp $")
 #include <sys/socket.h>
 
 #include <uvm/uvm.h>
-#include <uvm/uvm_extern.h>
-
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_ether.h>
diff --git a/sys/dev/mca/if_le_mca.c b/sys/dev/mca/if_le_mca.c
index 9a360dc17cd3..0c7b7ab44d2c 100644
--- a/sys/dev/mca/if_le_mca.c
+++ b/sys/dev/mca/if_le_mca.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_le_mca.c,v 1.18 2008/04/28 20:23:53 martin Exp $	*/
+/*	$NetBSD: if_le_mca.c,v 1.19 2010/11/13 13:52:04 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_mca.c,v 1.18 2008/04/28 20:23:53 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_mca.c,v 1.19 2010/11/13 13:52:04 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -54,8 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_mca.c,v 1.18 2008/04/28 20:23:53 martin Exp $"
 #include <sys/socket.h>
 #include <sys/device.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <net/if.h>
 #include <net/if_ether.h>
 #include <net/if_media.h>
diff --git a/sys/dev/mvme/if_ie_mvme.c b/sys/dev/mvme/if_ie_mvme.c
index 32e24c3f5a0c..a698a12a1eb9 100644
--- a/sys/dev/mvme/if_ie_mvme.c
+++ b/sys/dev/mvme/if_ie_mvme.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ie_mvme.c,v 1.16 2009/05/12 14:38:26 cegger Exp $	*/
+/*	$NetBSD: if_ie_mvme.c,v 1.17 2010/11/13 13:52:04 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie_mvme.c,v 1.16 2009/05/12 14:38:26 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_mvme.c,v 1.17 2010/11/13 13:52:04 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -46,8 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ie_mvme.c,v 1.16 2009/05/12 14:38:26 cegger Exp $
 #include <net/if_ether.h>
 #include <net/if_media.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <machine/autoconf.h>
 #include <sys/cpu.h>
 #include <sys/bus.h>
diff --git a/sys/dev/pci/agp.c b/sys/dev/pci/agp.c
index c9fe7d595c43..791c7c8657a8 100644
--- a/sys/dev/pci/agp.c
+++ b/sys/dev/pci/agp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: agp.c,v 1.75 2010/10/10 21:24:34 christos Exp $	*/
+/*	$NetBSD: agp.c,v 1.76 2010/11/13 13:52:04 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2000 Doug Rabson
@@ -65,7 +65,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp.c,v 1.75 2010/10/10 21:24:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp.c,v 1.76 2010/11/13 13:52:04 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -79,8 +79,6 @@ __KERNEL_RCSID(0, "$NetBSD: agp.c,v 1.75 2010/10/10 21:24:34 christos Exp $");
 #include <sys/proc.h>
 #include <sys/mutex.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/agpvar.h>
diff --git a/sys/dev/pci/agp_ali.c b/sys/dev/pci/agp_ali.c
index b0fe5c34dd9b..8480f855c38c 100644
--- a/sys/dev/pci/agp_ali.c
+++ b/sys/dev/pci/agp_ali.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: agp_ali.c,v 1.15 2008/06/09 06:49:54 freza Exp $	*/
+/*	$NetBSD: agp_ali.c,v 1.16 2010/11/13 13:52:04 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_ali.c,v 1.15 2008/06/09 06:49:54 freza Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_ali.c,v 1.16 2010/11/13 13:52:04 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -40,8 +40,6 @@ __KERNEL_RCSID(0, "$NetBSD: agp_ali.c,v 1.15 2008/06/09 06:49:54 freza Exp $");
 #include <sys/device.h>
 #include <sys/agpio.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/agpvar.h>
diff --git a/sys/dev/pci/agp_amd.c b/sys/dev/pci/agp_amd.c
index 597e44b0fd06..cf68e1c474fb 100644
--- a/sys/dev/pci/agp_amd.c
+++ b/sys/dev/pci/agp_amd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: agp_amd.c,v 1.20 2008/06/09 06:49:54 freza Exp $	*/
+/*	$NetBSD: agp_amd.c,v 1.21 2010/11/13 13:52:04 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_amd.c,v 1.20 2008/06/09 06:49:54 freza Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_amd.c,v 1.21 2010/11/13 13:52:04 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -40,8 +40,6 @@ __KERNEL_RCSID(0, "$NetBSD: agp_amd.c,v 1.20 2008/06/09 06:49:54 freza Exp $");
 #include <sys/device.h>
 #include <sys/agpio.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/agpvar.h>
diff --git a/sys/dev/pci/agp_amd64.c b/sys/dev/pci/agp_amd64.c
index 8a18cd335855..fb88373bcc62 100644
--- a/sys/dev/pci/agp_amd64.c
+++ b/sys/dev/pci/agp_amd64.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_amd64.c,v 1.5 2008/03/28 08:35:44 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_amd64.c,v 1.6 2010/11/13 13:52:04 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -36,8 +36,6 @@ __KERNEL_RCSID(0, "$NetBSD: agp_amd64.c,v 1.5 2008/03/28 08:35:44 kiyohara Exp $
 #include <sys/device.h>
 #include <sys/agpio.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/agpvar.h>
diff --git a/sys/dev/pci/agp_apple.c b/sys/dev/pci/agp_apple.c
index b7c58f03e808..91b6733308db 100644
--- a/sys/dev/pci/agp_apple.c
+++ b/sys/dev/pci/agp_apple.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: agp_apple.c,v 1.5 2008/06/09 06:49:54 freza Exp $ */
+/*	$NetBSD: agp_apple.c,v 1.6 2010/11/13 13:52:04 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_apple.c,v 1.5 2008/06/09 06:49:54 freza Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_apple.c,v 1.6 2010/11/13 13:52:04 uebayasi Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
@@ -37,8 +37,6 @@ __KERNEL_RCSID(0, "$NetBSD: agp_apple.c,v 1.5 2008/06/09 06:49:54 freza Exp $");
 #include <sys/device.h>
 #include <sys/agpio.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/agpvar.h>
diff --git a/sys/dev/pci/agp_i810.c b/sys/dev/pci/agp_i810.c
index ae9282442698..a0ae147ff1d8 100644
--- a/sys/dev/pci/agp_i810.c
+++ b/sys/dev/pci/agp_i810.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: agp_i810.c,v 1.68 2010/06/16 03:35:01 riz Exp $	*/
+/*	$NetBSD: agp_i810.c,v 1.69 2010/11/13 13:52:04 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2000 Doug Rabson
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.68 2010/06/16 03:35:01 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.69 2010/11/13 13:52:04 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -40,8 +40,6 @@ __KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.68 2010/06/16 03:35:01 riz Exp $");
 #include <sys/device.h>
 #include <sys/conf.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
diff --git a/sys/dev/pci/agp_intel.c b/sys/dev/pci/agp_intel.c
index 3aa7d8e22eef..d02e1625f73c 100644
--- a/sys/dev/pci/agp_intel.c
+++ b/sys/dev/pci/agp_intel.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: agp_intel.c,v 1.35 2010/04/04 14:40:05 jakllsch Exp $	*/
+/*	$NetBSD: agp_intel.c,v 1.36 2010/11/13 13:52:05 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_intel.c,v 1.35 2010/04/04 14:40:05 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_intel.c,v 1.36 2010/11/13 13:52:05 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -39,8 +39,6 @@ __KERNEL_RCSID(0, "$NetBSD: agp_intel.c,v 1.35 2010/04/04 14:40:05 jakllsch Exp
 #include <sys/agpio.h>
 #include <sys/device.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
diff --git a/sys/dev/pci/agp_sis.c b/sys/dev/pci/agp_sis.c
index 5cb41127c78e..ee0c520df781 100644
--- a/sys/dev/pci/agp_sis.c
+++ b/sys/dev/pci/agp_sis.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: agp_sis.c,v 1.13 2008/06/09 06:49:54 freza Exp $	*/
+/*	$NetBSD: agp_sis.c,v 1.14 2010/11/13 13:52:05 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_sis.c,v 1.13 2008/06/09 06:49:54 freza Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_sis.c,v 1.14 2010/11/13 13:52:05 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -40,8 +40,6 @@ __KERNEL_RCSID(0, "$NetBSD: agp_sis.c,v 1.13 2008/06/09 06:49:54 freza Exp $");
 #include <sys/device.h>
 #include <sys/agpio.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/agpvar.h>
diff --git a/sys/dev/pci/agp_via.c b/sys/dev/pci/agp_via.c
index 110ca953d187..215a99d4fe90 100644
--- a/sys/dev/pci/agp_via.c
+++ b/sys/dev/pci/agp_via.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: agp_via.c,v 1.18 2010/01/31 00:43:37 hubertf Exp $	*/
+/*	$NetBSD: agp_via.c,v 1.19 2010/11/13 13:52:05 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_via.c,v 1.18 2010/01/31 00:43:37 hubertf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_via.c,v 1.19 2010/11/13 13:52:05 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -40,8 +40,6 @@ __KERNEL_RCSID(0, "$NetBSD: agp_via.c,v 1.18 2010/01/31 00:43:37 hubertf Exp $")
 #include <sys/device.h>
 #include <sys/agpio.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/agpvar.h>
diff --git a/sys/dev/pci/ahcisata_pci.c b/sys/dev/pci/ahcisata_pci.c
index c2512f77b349..f4b534c476cf 100644
--- a/sys/dev/pci/ahcisata_pci.c
+++ b/sys/dev/pci/ahcisata_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ahcisata_pci.c,v 1.22 2010/08/07 02:39:01 jmcneill Exp $	*/
+/*	$NetBSD: ahcisata_pci.c,v 1.23 2010/11/13 13:52:05 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.22 2010/08/07 02:39:01 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.23 2010/11/13 13:52:05 uebayasi Exp $");
 
 #include <sys/types.h>
 #include <sys/malloc.h>
@@ -36,8 +36,6 @@ __KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.22 2010/08/07 02:39:01 jmcneill E
 #include <sys/disklabel.h>
 #include <sys/pmf.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pciidereg.h>
diff --git a/sys/dev/pci/amr.c b/sys/dev/pci/amr.c
index 6d2f0dc92724..a783edfa7ba2 100644
--- a/sys/dev/pci/amr.c
+++ b/sys/dev/pci/amr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: amr.c,v 1.53 2009/11/26 15:17:08 njoly Exp $	*/
+/*	$NetBSD: amr.c,v 1.54 2010/11/13 13:52:05 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.53 2009/11/26 15:17:08 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.54 2010/11/13 13:52:05 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -78,8 +78,6 @@ __KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.53 2009/11/26 15:17:08 njoly Exp $");
 #include <sys/kthread.h>
 #include <sys/kauth.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <machine/endian.h>
 #include <sys/bus.h>
 
diff --git a/sys/dev/pci/arcmsr.c b/sys/dev/pci/arcmsr.c
index 27683310627b..aeb488551d44 100644
--- a/sys/dev/pci/arcmsr.c
+++ b/sys/dev/pci/arcmsr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: arcmsr.c,v 1.25 2010/04/03 17:54:24 jruoho Exp $ */
+/*	$NetBSD: arcmsr.c,v 1.26 2010/11/13 13:52:05 uebayasi Exp $ */
 /*	$OpenBSD: arc.c,v 1.68 2007/10/27 03:28:27 dlg Exp $ */
 
 /*
@@ -21,7 +21,7 @@
 #include "bio.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arcmsr.c,v 1.25 2010/04/03 17:54:24 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arcmsr.c,v 1.26 2010/11/13 13:52:05 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -51,8 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: arcmsr.c,v 1.25 2010/04/03 17:54:24 jruoho Exp $");
 
 #include <sys/bus.h>
 
-#include <uvm/uvm_extern.h>	/* for PAGE_SIZE */
-
 #include <dev/pci/arcmsrvar.h>
 
 /* #define ARC_DEBUG */
diff --git a/sys/dev/pci/atppc_puc.c b/sys/dev/pci/atppc_puc.c
index 172885c01da1..48feed23eccc 100644
--- a/sys/dev/pci/atppc_puc.c
+++ b/sys/dev/pci/atppc_puc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_puc.c,v 1.11 2009/11/26 15:17:08 njoly Exp $ */
+/* $NetBSD: atppc_puc.c,v 1.12 2010/11/13 13:52:05 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include "opt_atppc.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_puc.c,v 1.11 2009/11/26 15:17:08 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_puc.c,v 1.12 2010/11/13 13:52:05 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -44,7 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: atppc_puc.c,v 1.11 2009/11/26 15:17:08 njoly Exp $")
 #include <sys/termios.h>
 
 #include <sys/bus.h>
-#include <uvm/uvm_extern.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pucvar.h>
diff --git a/sys/dev/pci/auacer.c b/sys/dev/pci/auacer.c
index 0535ae638c6d..18d02d613a7d 100644
--- a/sys/dev/pci/auacer.c
+++ b/sys/dev/pci/auacer.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: auacer.c,v 1.27 2010/02/24 22:37:59 dyoung Exp $	*/
+/*	$NetBSD: auacer.c,v 1.28 2010/11/13 13:52:05 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.27 2010/02/24 22:37:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.28 2010/11/13 13:52:05 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -54,8 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.27 2010/02/24 22:37:59 dyoung Exp $");
 #include <sys/fcntl.h>
 #include <sys/proc.h>
 
-#include <uvm/uvm_extern.h>	/* for PAGE_SIZE */
-
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/auacerreg.h>
diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c
index e7e8da8b824c..911960f631fb 100644
--- a/sys/dev/pci/auich.c
+++ b/sys/dev/pci/auich.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: auich.c,v 1.137 2010/02/24 22:37:59 dyoung Exp $	*/
+/*	$NetBSD: auich.c,v 1.138 2010/11/13 13:52:05 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2004, 2005 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.137 2010/02/24 22:37:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.138 2010/11/13 13:52:05 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -122,8 +122,6 @@ __KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.137 2010/02/24 22:37:59 dyoung Exp $");
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 
-#include <uvm/uvm_extern.h>	/* for PAGE_SIZE */
-
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/auichreg.h>
diff --git a/sys/dev/pci/auvia.c b/sys/dev/pci/auvia.c
index 84d8e9bfd793..c146b8e2c29f 100644
--- a/sys/dev/pci/auvia.c
+++ b/sys/dev/pci/auvia.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: auvia.c,v 1.72 2010/02/24 22:37:59 dyoung Exp $	*/
+/*	$NetBSD: auvia.c,v 1.73 2010/11/13 13:52:05 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.72 2010/02/24 22:37:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.73 2010/11/13 13:52:05 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -48,8 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.72 2010/02/24 22:37:59 dyoung Exp $");
 #include <sys/device.h>
 #include <sys/audioio.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 079b69320bfb..e21e949091d2 100644
--- a/sys/dev/pci/bktr/bktr_core.c
+++ b/sys/dev/pci/bktr/bktr_core.c
@@ -1,6 +1,6 @@
 /* $SourceForge: bktr_core.c,v 1.6 2003/03/11 23:11:22 thomasklausner Exp $ */
 
-/*	$NetBSD: bktr_core.c,v 1.50 2009/03/18 16:00:19 cegger Exp $	*/
+/*	$NetBSD: bktr_core.c,v 1.51 2010/11/13 13:52:09 uebayasi Exp $	*/
 /* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp$ */
 
 /*
@@ -98,7 +98,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.50 2009/03/18 16:00:19 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.51 2010/11/13 13:52:09 uebayasi Exp $");
 
 #include "opt_bktr.h"		/* Include any kernel config options */
 
@@ -194,7 +194,6 @@ bktr_name(bktr_ptr_t bktr)
 #include <sys/proc.h>
 
 #ifdef __NetBSD__
-#include <uvm/uvm_extern.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcireg.h>
 #else
diff --git a/sys/dev/pci/chipsfb.c b/sys/dev/pci/chipsfb.c
index f553ac664ed3..78c8694f34be 100644
--- a/sys/dev/pci/chipsfb.c
+++ b/sys/dev/pci/chipsfb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: chipsfb.c,v 1.21 2010/05/04 05:00:33 macallan Exp $	*/
+/*	$NetBSD: chipsfb.c,v 1.22 2010/11/13 13:52:05 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2006 Michael Lorenz
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: chipsfb.c,v 1.21 2010/05/04 05:00:33 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: chipsfb.c,v 1.22 2010/11/13 13:52:05 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -42,8 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: chipsfb.c,v 1.21 2010/05/04 05:00:33 macallan Exp $"
 #include <sys/lwp.h>
 #include <sys/kauth.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/videomode/videomode.h>
 
 #include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/esiop_pci.c b/sys/dev/pci/esiop_pci.c
index c7cde3346add..cfad34b6ac22 100644
--- a/sys/dev/pci/esiop_pci.c
+++ b/sys/dev/pci/esiop_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: esiop_pci.c,v 1.17 2009/10/19 18:41:15 bouyer Exp $	*/
+/*	$NetBSD: esiop_pci.c,v 1.18 2010/11/13 13:52:05 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2002 Manuel Bouyer.
@@ -27,15 +27,13 @@
 /* SYM53c8xx PCI-SCSI I/O Processors driver: PCI front-end */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esiop_pci.c,v 1.17 2009/10/19 18:41:15 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esiop_pci.c,v 1.18 2010/11/13 13:52:05 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
diff --git a/sys/dev/pci/fms.c b/sys/dev/pci/fms.c
index ac2198b03147..d2f2dcc0e32f 100644
--- a/sys/dev/pci/fms.c
+++ b/sys/dev/pci/fms.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fms.c,v 1.37 2009/11/26 15:17:09 njoly Exp $	*/
+/*	$NetBSD: fms.c,v 1.38 2010/11/13 13:52:05 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.37 2009/11/26 15:17:09 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.38 2010/11/13 13:52:05 uebayasi Exp $");
 
 #include "mpu.h"
 
@@ -45,8 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.37 2009/11/26 15:17:09 njoly Exp $");
 #include <sys/device.h>
 #include <sys/audioio.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bus.h>
 #include <sys/cpu.h>
 
diff --git a/sys/dev/pci/gcscaudio.c b/sys/dev/pci/gcscaudio.c
index 5996f5b30215..b5ae09b121a3 100644
--- a/sys/dev/pci/gcscaudio.c
+++ b/sys/dev/pci/gcscaudio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gcscaudio.c,v 1.5 2010/02/24 22:38:00 dyoung Exp $	*/
+/*	$NetBSD: gcscaudio.c,v 1.6 2010/11/13 13:52:05 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2008 SHIMIZU Ryo <ryo@nerv.org>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.5 2010/02/24 22:38:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.6 2010/11/13 13:52:05 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -35,8 +35,6 @@ __KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.5 2010/02/24 22:38:00 dyoung Exp $")
 #include <sys/device.h>
 #include <sys/queue.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcivar.h>
 
diff --git a/sys/dev/pci/geodeide.c b/sys/dev/pci/geodeide.c
index 6e3a4ea35a97..b63b9fe6b34a 100644
--- a/sys/dev/pci/geodeide.c
+++ b/sys/dev/pci/geodeide.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: geodeide.c,v 1.17 2010/11/05 18:07:24 jakllsch Exp $	*/
+/*	$NetBSD: geodeide.c,v 1.18 2010/11/13 13:52:05 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2004 Manuel Bouyer.
@@ -32,13 +32,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: geodeide.c,v 1.17 2010/11/05 18:07:24 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: geodeide.c,v 1.18 2010/11/13 13:52:05 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pciidereg.h>
diff --git a/sys/dev/pci/hifn7751.c b/sys/dev/pci/hifn7751.c
index 8fa282dba2c6..9cd187bddace 100644
--- a/sys/dev/pci/hifn7751.c
+++ b/sys/dev/pci/hifn7751.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hifn7751.c,v 1.45 2010/06/16 20:15:53 hubertf Exp $	*/
+/*	$NetBSD: hifn7751.c,v 1.46 2010/11/13 13:52:05 uebayasi Exp $	*/
 /*	$FreeBSD: hifn7751.c,v 1.5.2.7 2003/10/08 23:52:00 sam Exp $ */
 /*	$OpenBSD: hifn7751.c,v 1.140 2003/08/01 17:55:54 deraadt Exp $	*/
 
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.45 2010/06/16 20:15:53 hubertf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.46 2010/11/13 13:52:05 uebayasi Exp $");
 
 #include "rnd.h"
 
@@ -66,9 +66,6 @@ __KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.45 2010/06/16 20:15:53 hubertf Exp $"
 #include <sys/mbuf.h>
 #include <sys/device.h>
 
-#include <uvm/uvm_extern.h>
-
-
 #ifdef __OpenBSD__
 #include <crypto/crypto.h>
 #include <dev/rndvar.h>
diff --git a/sys/dev/pci/icp_pci.c b/sys/dev/pci/icp_pci.c
index e181d1599bad..d852d0d1edeb 100644
--- a/sys/dev/pci/icp_pci.c
+++ b/sys/dev/pci/icp_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: icp_pci.c,v 1.19 2009/11/26 15:17:09 njoly Exp $	*/
+/*	$NetBSD: icp_pci.c,v 1.20 2010/11/13 13:52:05 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icp_pci.c,v 1.19 2009/11/26 15:17:09 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icp_pci.c,v 1.20 2010/11/13 13:52:05 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -80,8 +80,6 @@ __KERNEL_RCSID(0, "$NetBSD: icp_pci.c,v 1.19 2009/11/26 15:17:09 njoly Exp $");
 #include <sys/endian.h>
 #include <sys/conf.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bus.h>
 
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/if_bce.c b/sys/dev/pci/if_bce.c
index 941ec9d960da..b492e23bb888 100644
--- a/sys/dev/pci/if_bce.c
+++ b/sys/dev/pci/if_bce.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bce.c,v 1.32 2010/04/05 07:20:25 joerg Exp $	 */
+/* $NetBSD: if_bce.c,v 1.33 2010/11/13 13:52:05 uebayasi Exp $	 */
 
 /*
  * Copyright (c) 2003 Clifford Wright. All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.32 2010/04/05 07:20:25 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.33 2010/11/13 13:52:05 uebayasi Exp $");
 
 #include "vlan.h"
 #include "rnd.h"
@@ -71,8 +71,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.32 2010/04/05 07:20:25 joerg Exp $");
 
 #include <dev/pci/if_bcereg.h>
 
-#include <uvm/uvm_extern.h>
-
 /* transmit buffer max frags allowed */
 #define BCE_NTXFRAGS	16
 
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index 89616fec6959..69f819260049 100644
--- a/sys/dev/pci/if_bge.c
+++ b/sys/dev/pci/if_bge.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bge.c,v 1.187 2010/10/16 06:29:33 taca Exp $	*/
+/*	$NetBSD: if_bge.c,v 1.188 2010/11/13 13:52:06 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.187 2010/10/16 06:29:33 taca Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.188 2010/11/13 13:52:06 uebayasi Exp $");
 
 #include "vlan.h"
 #include "rnd.h"
@@ -132,7 +132,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.187 2010/10/16 06:29:33 taca Exp $");
 #include <dev/pci/if_bgereg.h>
 #include <dev/pci/if_bgevar.h>
 
-#include <uvm/uvm_extern.h>
 #include <prop/proplib.h>
 
 #define ETHER_MIN_NOPAD (ETHER_MIN_LEN - ETHER_CRC_LEN) /* i.e., 60 */
diff --git a/sys/dev/pci/if_cas.c b/sys/dev/pci/if_cas.c
index 2f41be4f92e9..a03cbdb45f7f 100644
--- a/sys/dev/pci/if_cas.c
+++ b/sys/dev/pci/if_cas.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_cas.c,v 1.11 2010/07/14 09:52:39 jnemeth Exp $	*/
+/*	$NetBSD: if_cas.c,v 1.12 2010/11/13 13:52:06 uebayasi Exp $	*/
 /*	$OpenBSD: if_cas.c,v 1.29 2009/11/29 16:19:38 kettenis Exp $	*/
 
 /*
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.11 2010/07/14 09:52:39 jnemeth Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.12 2010/11/13 13:52:06 uebayasi Exp $");
 
 #include "opt_inet.h"
 
@@ -62,8 +62,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.11 2010/07/14 09:52:39 jnemeth Exp $");
 
 #include <machine/endian.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index e7cb3fcd8df9..57547c3f0f81 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_de.c,v 1.137 2010/04/05 07:20:25 joerg Exp $	*/
+/*	$NetBSD: if_de.c,v 1.138 2010/11/13 13:52:06 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -37,7 +37,7 @@
  *   board which support 21040, 21041, or 21140 (mostly).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.137 2010/04/05 07:20:25 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.138 2010/11/13 13:52:06 uebayasi Exp $");
 
 #define	TULIP_HDR_DATA
 
@@ -93,11 +93,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.137 2010/04/05 07:20:25 joerg Exp $");
 #include <netinet/ip.h>
 #endif
 
-
-#if defined(__NetBSD__)
-#include <uvm/uvm_extern.h>
-#endif
-
 #if defined(__FreeBSD__)
 #include <vm/vm.h>
 #include <vm/pmap.h>
diff --git a/sys/dev/pci/if_dge.c b/sys/dev/pci/if_dge.c
index f19e51172bd7..0a869b9618bd 100644
--- a/sys/dev/pci/if_dge.c
+++ b/sys/dev/pci/if_dge.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_dge.c,v 1.30 2010/04/05 07:20:25 joerg Exp $ */
+/*	$NetBSD: if_dge.c,v 1.31 2010/11/13 13:52:06 uebayasi Exp $ */
 
 /*
  * Copyright (c) 2004, SUNET, Swedish University Computer Network.
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.30 2010/04/05 07:20:25 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.31 2010/11/13 13:52:06 uebayasi Exp $");
 
 #include "rnd.h"
 
@@ -96,8 +96,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.30 2010/04/05 07:20:25 joerg Exp $");
 #include <sys/device.h>
 #include <sys/queue.h>
 
-#include <uvm/uvm_extern.h>		/* for PAGE_SIZE */
-
 #if NRND > 0
 #include <sys/rnd.h>
 #endif
diff --git a/sys/dev/pci/if_gem_pci.c b/sys/dev/pci/if_gem_pci.c
index f5f6954843ac..991ca01f594a 100644
--- a/sys/dev/pci/if_gem_pci.c
+++ b/sys/dev/pci/if_gem_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_gem_pci.c,v 1.42 2010/02/24 22:38:00 dyoung Exp $ */
+/*	$NetBSD: if_gem_pci.c,v 1.43 2010/11/13 13:52:06 uebayasi Exp $ */
 
 /*
  *
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.42 2010/02/24 22:38:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.43 2010/11/13 13:52:06 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -46,8 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.42 2010/02/24 22:38:00 dyoung Exp $
 
 #include <machine/endian.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c
index 11a41f96f758..a0a486c5b0ed 100644
--- a/sys/dev/pci/if_jme.c
+++ b/sys/dev/pci/if_jme.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_jme.c,v 1.14 2010/04/05 07:20:26 joerg Exp $	*/
+/*	$NetBSD: if_jme.c,v 1.15 2010/11/13 13:52:06 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2008 Manuel Bouyer.  All rights reserved.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.14 2010/04/05 07:20:26 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.15 2010/11/13 13:52:06 uebayasi Exp $");
 
 
 #include <sys/param.h>
@@ -103,7 +103,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.14 2010/04/05 07:20:26 joerg Exp $");
 #include <netinet/tcp.h>
 
 #include <net/if_ether.h>
-#include <uvm/uvm_extern.h>
 #if defined(INET)
 #include <netinet/if_inarp.h>
 #endif
diff --git a/sys/dev/pci/if_le_pci.c b/sys/dev/pci/if_le_pci.c
index 50c658efcd21..1a31f7cc2765 100644
--- a/sys/dev/pci/if_le_pci.c
+++ b/sys/dev/pci/if_le_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_le_pci.c,v 1.49 2008/04/28 20:23:55 martin Exp $	*/
+/*	$NetBSD: if_le_pci.c,v 1.50 2010/11/13 13:52:06 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_pci.c,v 1.49 2008/04/28 20:23:55 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_pci.c,v 1.50 2010/11/13 13:52:06 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -74,8 +74,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_pci.c,v 1.49 2008/04/28 20:23:55 martin Exp $"
 #include <sys/socket.h>
 #include <sys/device.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <net/if.h>
 #include <net/if_ether.h>
 #include <net/if_media.h>
diff --git a/sys/dev/pci/if_lmc.c b/sys/dev/pci/if_lmc.c
index 426d9a671f65..8b1fcf4e69eb 100644
--- a/sys/dev/pci/if_lmc.c
+++ b/sys/dev/pci/if_lmc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lmc.c,v 1.49 2010/01/19 22:07:01 pooka Exp $ */
+/* $NetBSD: if_lmc.c,v 1.50 2010/11/13 13:52:06 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 2002-2006 David Boggs. <boggs@boggs.palo-alto.ca.us>
@@ -74,7 +74,7 @@
  */
 
 # include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.49 2010/01/19 22:07:01 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.50 2010/11/13 13:52:06 uebayasi Exp $");
 # include <sys/param.h>	/* OS version */
 # include "opt_inet.h"	/* INET6, INET */
 # include "opt_altq_enabled.h" /* ALTQ */
@@ -108,7 +108,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.49 2010/01/19 22:07:01 pooka Exp $");
 # include <machine/lock.h>
 # include <machine/types.h>
 # include <dev/pci/pcivar.h>
-# include <uvm/uvm_extern.h>
 # if INET || INET6
 #  include <netinet/in.h>
 #  include <netinet/in_var.h>
diff --git a/sys/dev/pci/if_pcn.c b/sys/dev/pci/if_pcn.c
index 0b791316b7bf..15035e4ee84e 100644
--- a/sys/dev/pci/if_pcn.c
+++ b/sys/dev/pci/if_pcn.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_pcn.c,v 1.51 2010/04/30 21:17:19 hubertf Exp $	*/
+/*	$NetBSD: if_pcn.c,v 1.52 2010/11/13 13:52:06 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.51 2010/04/30 21:17:19 hubertf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.52 2010/11/13 13:52:06 uebayasi Exp $");
 
 #include "rnd.h"
 
@@ -85,8 +85,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.51 2010/04/30 21:17:19 hubertf Exp $");
 #include <sys/rnd.h>
 #endif
 
-#include <uvm/uvm_extern.h>		/* for PAGE_SIZE */
-
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/pci/if_sip.c b/sys/dev/pci/if_sip.c
index d5b4d0d013c2..702431752fba 100644
--- a/sys/dev/pci/if_sip.c
+++ b/sys/dev/pci/if_sip.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_sip.c,v 1.148 2010/04/05 07:20:26 joerg Exp $	*/
+/*	$NetBSD: if_sip.c,v 1.149 2010/11/13 13:52:06 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.148 2010/04/05 07:20:26 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.149 2010/11/13 13:52:06 uebayasi Exp $");
 
 #include "rnd.h"
 
@@ -89,8 +89,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.148 2010/04/05 07:20:26 joerg Exp $");
 #include <sys/device.h>
 #include <sys/queue.h>
 
-#include <uvm/uvm_extern.h>		/* for PAGE_SIZE */
-
 #if NRND > 0
 #include <sys/rnd.h>
 #endif
diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c
index 155d4a1841a2..7b3d07e96d61 100644
--- a/sys/dev/pci/if_ste.c
+++ b/sys/dev/pci/if_ste.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ste.c,v 1.41 2010/04/05 07:20:27 joerg Exp $	*/
+/*	$NetBSD: if_ste.c,v 1.42 2010/11/13 13:52:07 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.41 2010/04/05 07:20:27 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.42 2010/11/13 13:52:07 uebayasi Exp $");
 
 
 #include <sys/param.h>
@@ -50,8 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.41 2010/04/05 07:20:27 joerg Exp $");
 #include <sys/device.h>
 #include <sys/queue.h>
 
-#include <uvm/uvm_extern.h>		/* for PAGE_SIZE */
-
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/pci/if_stge.c b/sys/dev/pci/if_stge.c
index f456a3872c66..8071757e5a90 100644
--- a/sys/dev/pci/if_stge.c
+++ b/sys/dev/pci/if_stge.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_stge.c,v 1.50 2010/04/05 07:20:27 joerg Exp $	*/
+/*	$NetBSD: if_stge.c,v 1.51 2010/11/13 13:52:07 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.50 2010/04/05 07:20:27 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.51 2010/11/13 13:52:07 uebayasi Exp $");
 
 
 #include <sys/param.h>
@@ -50,8 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.50 2010/04/05 07:20:27 joerg Exp $");
 #include <sys/device.h>
 #include <sys/queue.h>
 
-#include <uvm/uvm_extern.h>		/* for PAGE_SIZE */
-
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c
index 2b98a8610831..51ccf360700d 100644
--- a/sys/dev/pci/if_ti.c
+++ b/sys/dev/pci/if_ti.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ti.c,v 1.89 2010/04/05 07:20:27 joerg Exp $ */
+/* $NetBSD: if_ti.c,v 1.90 2010/11/13 13:52:07 uebayasi Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -81,7 +81,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.89 2010/04/05 07:20:27 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.90 2010/11/13 13:52:07 uebayasi Exp $");
 
 #include "opt_inet.h"
 
@@ -96,8 +96,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.89 2010/04/05 07:20:27 joerg Exp $");
 #include <sys/device.h>
 #include <sys/reboot.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <net/if_ether.h>
diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c
index 9beee11619cd..4a9eb4a41670 100644
--- a/sys/dev/pci/if_tl.c
+++ b/sys/dev/pci/if_tl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tl.c,v 1.95 2010/04/05 07:20:27 joerg Exp $	*/
+/*	$NetBSD: if_tl.c,v 1.96 2010/11/13 13:52:07 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1997 Manuel Bouyer.  All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.95 2010/04/05 07:20:27 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.96 2010/11/13 13:52:07 uebayasi Exp $");
 
 #undef TLDEBUG
 #define TL_PRIV_STATS
@@ -80,7 +80,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.95 2010/04/05 07:20:27 joerg Exp $");
 
 #if defined(__NetBSD__)
 #include <net/if_ether.h>
-#include <uvm/uvm_extern.h>
 #if defined(INET)
 #include <netinet/if_inarp.h>
 #endif
diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c
index 04a9822cca6b..bcc1b961ef2a 100644
--- a/sys/dev/pci/if_txp.c
+++ b/sys/dev/pci/if_txp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_txp.c,v 1.37 2010/04/05 07:20:27 joerg Exp $ */
+/* $NetBSD: if_txp.c,v 1.38 2010/11/13 13:52:07 uebayasi Exp $ */
 
 /*
  * Copyright (c) 2001
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.37 2010/04/05 07:20:27 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.38 2010/11/13 13:52:07 uebayasi Exp $");
 
 #include "opt_inet.h"
 
@@ -64,7 +64,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.37 2010/04/05 07:20:27 joerg Exp $");
 
 #include <net/bpf.h>
 
-#include <uvm/uvm_extern.h>              /* for PAGE_SIZE */
 #include <sys/bus.h>
 
 #include <dev/mii/mii.h>
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c
index 998ff4e534d8..e42457debe30 100644
--- a/sys/dev/pci/if_vr.c
+++ b/sys/dev/pci/if_vr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_vr.c,v 1.105 2010/04/28 22:08:58 hubertf Exp $	*/
+/*	$NetBSD: if_vr.c,v 1.106 2010/11/13 13:52:07 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.105 2010/04/28 22:08:58 hubertf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.106 2010/11/13 13:52:07 uebayasi Exp $");
 
 #include "rnd.h"
 
@@ -115,8 +115,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.105 2010/04/28 22:08:58 hubertf Exp $");
 #include <sys/rnd.h>
 #endif
 
-#include <uvm/uvm_extern.h>		/* for PAGE_SIZE */
-
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/pci/if_wm.c b/sys/dev/pci/if_wm.c
index 46d2639dea38..829a62d95dcb 100644
--- a/sys/dev/pci/if_wm.c
+++ b/sys/dev/pci/if_wm.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.215 2010/10/16 06:31:49 taca Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.216 2010/11/13 13:52:07 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.215 2010/10/16 06:31:49 taca Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.216 2010/11/13 13:52:07 uebayasi Exp $");
 
 #include "rnd.h"
 
@@ -93,8 +93,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.215 2010/10/16 06:31:49 taca Exp $");
 #include <sys/queue.h>
 #include <sys/syslog.h>
 
-#include <uvm/uvm_extern.h>		/* for PAGE_SIZE */
-
 #if NRND > 0
 #include <sys/rnd.h>
 #endif
diff --git a/sys/dev/pci/iha_pci.c b/sys/dev/pci/iha_pci.c
index 78ff728d4dab..a7fe3230c12e 100644
--- a/sys/dev/pci/iha_pci.c
+++ b/sys/dev/pci/iha_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iha_pci.c,v 1.16 2008/05/14 13:29:29 tsutsui Exp $ */
+/*	$NetBSD: iha_pci.c,v 1.17 2010/11/13 13:52:07 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 2001 Izumi Tsutsui.  All rights reserved.
@@ -62,14 +62,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iha_pci.c,v 1.16 2008/05/14 13:29:29 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iha_pci.c,v 1.17 2010/11/13 13:52:07 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcivar.h>
 
diff --git a/sys/dev/pci/isp_pci.c b/sys/dev/pci/isp_pci.c
index 63a5ad9479f3..083261661017 100644
--- a/sys/dev/pci/isp_pci.c
+++ b/sys/dev/pci/isp_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_pci.c,v 1.112 2010/04/12 14:26:21 mjacob Exp $ */
+/* $NetBSD: isp_pci.c,v 1.113 2010/11/13 13:52:07 uebayasi Exp $ */
 /*
  * Copyright (C) 1997, 1998, 1999 National Aeronautics & Space Administration
  * All rights reserved.
@@ -38,13 +38,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp_pci.c,v 1.112 2010/04/12 14:26:21 mjacob Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_pci.c,v 1.113 2010/11/13 13:52:07 uebayasi Exp $");
 
 #include <dev/ic/isp_netbsd.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
-#include <uvm/uvm_extern.h>
 #include <sys/reboot.h>
 
 static uint32_t isp_pci_rd_reg(struct ispsoftc *, int);
diff --git a/sys/dev/pci/ld_amr.c b/sys/dev/pci/ld_amr.c
index c4908ea78a87..2fc61427b0c6 100644
--- a/sys/dev/pci/ld_amr.c
+++ b/sys/dev/pci/ld_amr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ld_amr.c,v 1.19 2009/05/12 08:23:01 cegger Exp $	*/
+/*	$NetBSD: ld_amr.c,v 1.20 2010/11/13 13:52:07 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_amr.c,v 1.19 2009/05/12 08:23:01 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_amr.c,v 1.20 2010/11/13 13:52:07 uebayasi Exp $");
 
 #include "rnd.h"
 
@@ -51,8 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: ld_amr.c,v 1.19 2009/05/12 08:23:01 cegger Exp $");
 #include <sys/rnd.h>
 #endif
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bus.h>
 
 #include <dev/ldvar.h>
diff --git a/sys/dev/pci/ld_twa.c b/sys/dev/pci/ld_twa.c
index c7f40a73b5b0..182e0165561a 100644
--- a/sys/dev/pci/ld_twa.c
+++ b/sys/dev/pci/ld_twa.c
@@ -1,5 +1,5 @@
 /*	$wasabi: ld_twa.c,v 1.9 2006/02/14 18:44:37 jordanr Exp $	*/
-/*	$NetBSD: ld_twa.c,v 1.13 2008/09/09 12:45:40 tron Exp $ */
+/*	$NetBSD: ld_twa.c,v 1.14 2010/11/13 13:52:07 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 2000, 2001, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_twa.c,v 1.13 2008/09/09 12:45:40 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_twa.c,v 1.14 2010/11/13 13:52:07 uebayasi Exp $");
 
 #include "rnd.h"
 
@@ -56,8 +56,6 @@ __KERNEL_RCSID(0, "$NetBSD: ld_twa.c,v 1.13 2008/09/09 12:45:40 tron Exp $");
 
 #include <sys/bus.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/ldvar.h>
 
 #include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/pci/ld_twe.c b/sys/dev/pci/ld_twe.c
index 4f76c426f1d3..40dc3f59c637 100644
--- a/sys/dev/pci/ld_twe.c
+++ b/sys/dev/pci/ld_twe.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ld_twe.c,v 1.34 2009/05/12 08:23:01 cegger Exp $	*/
+/*	$NetBSD: ld_twe.c,v 1.35 2010/11/13 13:52:07 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_twe.c,v 1.34 2009/05/12 08:23:01 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_twe.c,v 1.35 2010/11/13 13:52:07 uebayasi Exp $");
 
 #include "rnd.h"
 
@@ -54,8 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: ld_twe.c,v 1.34 2009/05/12 08:23:01 cegger Exp $");
 
 #include <sys/bus.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/ldvar.h>
 
 #include <dev/pci/twereg.h>
diff --git a/sys/dev/pci/mly.c b/sys/dev/pci/mly.c
index 61d1f03e9b60..90ba13af0d22 100644
--- a/sys/dev/pci/mly.c
+++ b/sys/dev/pci/mly.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mly.c,v 1.43 2009/11/26 15:17:10 njoly Exp $	*/
+/*	$NetBSD: mly.c,v 1.44 2010/11/13 13:52:07 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mly.c,v 1.43 2009/11/26 15:17:10 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mly.c,v 1.44 2010/11/13 13:52:07 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -86,8 +86,6 @@ __KERNEL_RCSID(0, "$NetBSD: mly.c,v 1.43 2009/11/26 15:17:10 njoly Exp $");
 #include <sys/kthread.h>
 #include <sys/kauth.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bus.h>
 
 #include <dev/scsipi/scsi_all.h>
diff --git a/sys/dev/pci/n8/common/config.c b/sys/dev/pci/n8/common/config.c
index b506f8e5bcf2..d24c20eb0796 100644
--- a/sys/dev/pci/n8/common/config.c
+++ b/sys/dev/pci/n8/common/config.c
@@ -32,7 +32,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-static char const n8_id[] = "$Id: config.c,v 1.2 2008/11/12 12:36:16 ad Exp $";
+static char const n8_id[] = "$Id: config.c,v 1.3 2010/11/13 13:52:09 uebayasi Exp $";
 /*****************************************************************************/
 /** @file config.c
  *  @brief NSP2000 Device Driver Configuration Manager.
@@ -175,8 +175,6 @@ static char const n8_id[] = "$Id: config.c,v 1.2 2008/11/12 12:36:16 ad Exp $";
 #include <sys/module.h>
 #include <sys/bus.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <opencrypto/cryptodev.h>
 #include <opencrypto/xform.h>
 #include <sys/rnd.h>
diff --git a/sys/dev/pci/n8/nsp.c b/sys/dev/pci/n8/nsp.c
index 65a7d7c3ed14..f2953fe29d97 100644
--- a/sys/dev/pci/n8/nsp.c
+++ b/sys/dev/pci/n8/nsp.c
@@ -80,8 +80,6 @@
 #include <sys/module.h>
 #include <sys/bus.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <opencrypto/cryptodev.h>
 #include <opencrypto/xform.h>
 #include <sys/rnd.h>
diff --git a/sys/dev/pci/oboe.c b/sys/dev/pci/oboe.c
index 2f46fa733f4c..7dd797736b66 100644
--- a/sys/dev/pci/oboe.c
+++ b/sys/dev/pci/oboe.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: oboe.c,v 1.37 2009/11/26 15:17:10 njoly Exp $	*/
+/*	$NetBSD: oboe.c,v 1.38 2010/11/13 13:52:07 uebayasi Exp $	*/
 
 /*	XXXXFVDL THIS DRIVER IS BROKEN FOR NON-i386 -- vtophys() usage	*/
 
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.37 2009/11/26 15:17:10 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.38 2010/11/13 13:52:07 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -60,7 +60,6 @@ __KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.37 2009/11/26 15:17:10 njoly Exp $");
 
 #include <sys/bus.h>
 #include <sys/intr.h>
-#include <uvm/uvm_extern.h>
 
 #include <dev/pci/oboereg.h>
 
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index f2b9c6359936..8374193675f9 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci.c,v 1.129 2010/06/06 18:58:23 pgoyette Exp $	*/
+/*	$NetBSD: pci.c,v 1.130 2010/11/13 13:52:08 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996, 1997, 1998
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.129 2010/06/06 18:58:23 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.130 2010/11/13 13:52:08 uebayasi Exp $");
 
 #include "opt_pci.h"
 
@@ -49,8 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.129 2010/06/06 18:58:23 pgoyette Exp $");
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <net/if.h>
 
 #include "locators.h"
diff --git a/sys/dev/pci/pciide_common.c b/sys/dev/pci/pciide_common.c
index 727928cd6da4..a182cc628793 100644
--- a/sys/dev/pci/pciide_common.c
+++ b/sys/dev/pci/pciide_common.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pciide_common.c,v 1.46 2010/11/06 00:29:09 jakllsch Exp $	*/
+/*	$NetBSD: pciide_common.c,v 1.47 2010/11/13 13:52:08 uebayasi Exp $	*/
 
 
 /*
@@ -70,13 +70,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.46 2010/11/06 00:29:09 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.47 2010/11/13 13:52:08 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
diff --git a/sys/dev/pci/pcscp.c b/sys/dev/pci/pcscp.c
index 575503dce794..8814a8c28d48 100644
--- a/sys/dev/pci/pcscp.c
+++ b/sys/dev/pci/pcscp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcscp.c,v 1.44 2008/08/28 16:47:10 tsutsui Exp $	*/
+/*	$NetBSD: pcscp.c,v 1.45 2010/11/13 13:52:08 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcscp.c,v 1.44 2008/08/28 16:47:10 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcscp.c,v 1.45 2010/11/13 13:52:08 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -49,8 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: pcscp.c,v 1.44 2008/08/28 16:47:10 tsutsui Exp $");
 #include <sys/bus.h>
 #include <sys/intr.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsiconf.h>
diff --git a/sys/dev/pci/pm2fb.c b/sys/dev/pci/pm2fb.c
index 430056a3f66e..264b18584eae 100644
--- a/sys/dev/pci/pm2fb.c
+++ b/sys/dev/pci/pm2fb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pm2fb.c,v 1.4 2010/05/04 05:00:33 macallan Exp $	*/
+/*	$NetBSD: pm2fb.c,v 1.5 2010/11/13 13:52:08 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2009 Michael Lorenz
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pm2fb.c,v 1.4 2010/05/04 05:00:33 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pm2fb.c,v 1.5 2010/11/13 13:52:08 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -41,8 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: pm2fb.c,v 1.4 2010/05/04 05:00:33 macallan Exp $");
 #include <sys/lwp.h>
 #include <sys/kauth.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/videomode/videomode.h>
 
 #include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/r128fb.c b/sys/dev/pci/r128fb.c
index 350f2a48ecf9..0735c4dc3dd4 100644
--- a/sys/dev/pci/r128fb.c
+++ b/sys/dev/pci/r128fb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: r128fb.c,v 1.14 2010/10/07 20:39:54 macallan Exp $	*/
+/*	$NetBSD: r128fb.c,v 1.15 2010/11/13 13:52:08 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2007 Michael Lorenz
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.14 2010/10/07 20:39:54 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.15 2010/11/13 13:52:08 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -41,8 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.14 2010/10/07 20:39:54 macallan Exp $")
 #include <sys/lwp.h>
 #include <sys/kauth.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/videomode/videomode.h>
 
 #include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/siisata_pci.c b/sys/dev/pci/siisata_pci.c
index d763beb75a52..834aec56f66a 100644
--- a/sys/dev/pci/siisata_pci.c
+++ b/sys/dev/pci/siisata_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: siisata_pci.c,v 1.8 2010/02/24 22:38:01 dyoung Exp $ */
+/* $NetBSD: siisata_pci.c,v 1.9 2010/11/13 13:52:08 uebayasi Exp $ */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siisata_pci.c,v 1.8 2010/02/24 22:38:01 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siisata_pci.c,v 1.9 2010/11/13 13:52:08 uebayasi Exp $");
 
 #include <sys/types.h>
 #include <sys/malloc.h>
@@ -59,8 +59,6 @@ __KERNEL_RCSID(0, "$NetBSD: siisata_pci.c,v 1.8 2010/02/24 22:38:01 dyoung Exp $
 #include <sys/kernel.h>
 #include <sys/systm.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/ic/siisatavar.h>
diff --git a/sys/dev/pci/siop_pci.c b/sys/dev/pci/siop_pci.c
index 61bb41263bd3..837f19523dff 100644
--- a/sys/dev/pci/siop_pci.c
+++ b/sys/dev/pci/siop_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: siop_pci.c,v 1.26 2009/10/19 18:41:16 bouyer Exp $	*/
+/*	$NetBSD: siop_pci.c,v 1.27 2010/11/13 13:52:08 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2000 Manuel Bouyer.
@@ -27,15 +27,13 @@
 /* SYM53c8xx PCI-SCSI I/O Processors driver: PCI front-end */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop_pci.c,v 1.26 2009/10/19 18:41:16 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop_pci.c,v 1.27 2010/11/13 13:52:08 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
diff --git a/sys/dev/pci/siop_pci_common.c b/sys/dev/pci/siop_pci_common.c
index 5394cf011941..087b8cdd26ac 100644
--- a/sys/dev/pci/siop_pci_common.c
+++ b/sys/dev/pci/siop_pci_common.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: siop_pci_common.c,v 1.33 2009/11/26 15:17:10 njoly Exp $	*/
+/*	$NetBSD: siop_pci_common.c,v 1.34 2010/11/13 13:52:08 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2000 Manuel Bouyer.
@@ -27,7 +27,7 @@
 /* SYM53c8xx PCI-SCSI I/O Processors driver: PCI front-end */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop_pci_common.c,v 1.33 2009/11/26 15:17:10 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop_pci_common.c,v 1.34 2010/11/13 13:52:08 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -36,8 +36,6 @@ __KERNEL_RCSID(0, "$NetBSD: siop_pci_common.c,v 1.33 2009/11/26 15:17:10 njoly E
 #include <sys/buf.h>
 #include <sys/kernel.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <machine/endian.h>
 
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/tga.c b/sys/dev/pci/tga.c
index 6173bf08de49..e4ce40758ebd 100644
--- a/sys/dev/pci/tga.c
+++ b/sys/dev/pci/tga.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tga.c,v 1.79 2010/05/15 08:53:27 tsutsui Exp $ */
+/* $NetBSD: tga.c,v 1.80 2010/11/13 13:52:08 uebayasi Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.79 2010/05/15 08:53:27 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.80 2010/11/13 13:52:08 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -58,8 +58,6 @@ __KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.79 2010/05/15 08:53:27 tsutsui Exp $");
 #include <dev/wscons/wscons_raster.h>
 #include <dev/rasops/rasops.h>
 #include <dev/wsfont/wsfont.h>
-#include <uvm/uvm_extern.h>
-
 int	tgamatch(device_t, cfdata_t, void *);
 void	tgaattach(device_t, device_t, void *);
 int	tgaprint(void *, const char *);
diff --git a/sys/dev/pci/trm.c b/sys/dev/pci/trm.c
index 03ea0af0da69..0915de3d9163 100644
--- a/sys/dev/pci/trm.c
+++ b/sys/dev/pci/trm.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: trm.c,v 1.31 2010/07/27 14:34:34 jakllsch Exp $	*/
+/*	$NetBSD: trm.c,v 1.32 2010/11/13 13:52:08 uebayasi Exp $	*/
 /*-
  * Copyright (c) 2002 Izumi Tsutsui.  All rights reserved.
  *
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trm.c,v 1.31 2010/07/27 14:34:34 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trm.c,v 1.32 2010/11/13 13:52:08 uebayasi Exp $");
 
 /* #define TRM_DEBUG */
 #ifdef TRM_DEBUG
@@ -86,8 +86,6 @@ int trm_debug = 1;
 #include <sys/bus.h>
 #include <sys/intr.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/scsipi/scsi_spc.h>
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsi_message.h>
diff --git a/sys/dev/pci/twa.c b/sys/dev/pci/twa.c
index 7674c4d47bd6..29ec2ff7904b 100644
--- a/sys/dev/pci/twa.c
+++ b/sys/dev/pci/twa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: twa.c,v 1.33 2009/08/18 11:15:43 drochner Exp $ */
+/*	$NetBSD: twa.c,v 1.34 2010/11/13 13:52:08 uebayasi Exp $ */
 /*	$wasabi: twa.c,v 1.27 2006/07/28 18:17:21 wrstuden Exp $	*/
 
 /*-
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.33 2009/08/18 11:15:43 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.34 2010/11/13 13:52:08 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -88,8 +88,6 @@ __KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.33 2009/08/18 11:15:43 drochner Exp $");
 #include <sys/ktrace.h>
 #endif
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bus.h>
 
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/twe.c b/sys/dev/pci/twe.c
index 2dbba20bda86..19682a11befc 100644
--- a/sys/dev/pci/twe.c
+++ b/sys/dev/pci/twe.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: twe.c,v 1.91 2010/07/27 14:34:34 jakllsch Exp $	*/
+/*	$NetBSD: twe.c,v 1.92 2010/11/13 13:52:08 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.91 2010/07/27 14:34:34 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.92 2010/11/13 13:52:08 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -80,8 +80,6 @@ __KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.91 2010/07/27 14:34:34 jakllsch Exp $");
 #include <sys/syslog.h>
 #include <sys/kauth.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bswap.h>
 #include <sys/bus.h>
 
diff --git a/sys/dev/pci/ubsec.c b/sys/dev/pci/ubsec.c
index be21710a63b8..69edacd7c39e 100644
--- a/sys/dev/pci/ubsec.c
+++ b/sys/dev/pci/ubsec.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ubsec.c,v 1.24 2009/11/26 15:17:10 njoly Exp $	*/
+/*	$NetBSD: ubsec.c,v 1.25 2010/11/13 13:52:09 uebayasi Exp $	*/
 /* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.6.2.6 2003/01/23 21:06:43 sam Exp $ */
 /*	$OpenBSD: ubsec.c,v 1.127 2003/06/04 14:04:58 jason Exp $	*/
 
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.24 2009/11/26 15:17:10 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.25 2010/11/13 13:52:09 uebayasi Exp $");
 
 #undef UBSEC_DEBUG
 
@@ -59,8 +59,6 @@ __KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.24 2009/11/26 15:17:10 njoly Exp $");
 #include <sys/device.h>
 #include <sys/queue.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <opencrypto/cryptodev.h>
 #include <opencrypto/xform.h>
 #ifdef __OpenBSD__
diff --git a/sys/dev/pci/voodoofb.c b/sys/dev/pci/voodoofb.c
index 9e003ad2e4d6..278bb14d074e 100644
--- a/sys/dev/pci/voodoofb.c
+++ b/sys/dev/pci/voodoofb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: voodoofb.c,v 1.23 2010/10/12 16:00:21 macallan Exp $	*/
+/*	$NetBSD: voodoofb.c,v 1.24 2010/11/13 13:52:09 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006 Michael Lorenz
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.23 2010/10/12 16:00:21 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.24 2010/11/13 13:52:09 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -42,8 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.23 2010/10/12 16:00:21 macallan Exp $
 #include <sys/callout.h>
 #include <sys/kauth.h>
 
-#include <uvm/uvm_extern.h>
-
 #if defined(macppc) || defined (sparc64) || defined(ofppc)
 #define HAVE_OPENFIRMWARE
 #endif
diff --git a/sys/dev/pci/voyagerfb.c b/sys/dev/pci/voyagerfb.c
index 2381b74c5295..aeb4c0ef506a 100644
--- a/sys/dev/pci/voyagerfb.c
+++ b/sys/dev/pci/voyagerfb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: voyagerfb.c,v 1.3 2010/05/04 05:00:33 macallan Exp $	*/
+/*	$NetBSD: voyagerfb.c,v 1.4 2010/11/13 13:52:09 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2009 Michael Lorenz
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: voyagerfb.c,v 1.3 2010/05/04 05:00:33 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: voyagerfb.c,v 1.4 2010/11/13 13:52:09 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -41,8 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: voyagerfb.c,v 1.3 2010/05/04 05:00:33 macallan Exp $
 #include <sys/lwp.h>
 #include <sys/kauth.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/videomode/videomode.h>
 
 #include <dev/pci/pcivar.h>
diff --git a/sys/dev/qbus/if_uba.c b/sys/dev/qbus/if_uba.c
index d1fc62d8065f..5f5fc2fabe86 100644
--- a/sys/dev/qbus/if_uba.c
+++ b/sys/dev/qbus/if_uba.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_uba.c,v 1.30 2008/03/11 05:34:01 matt Exp $	*/
+/*	$NetBSD: if_uba.c,v 1.31 2010/11/13 13:52:10 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_uba.c,v 1.30 2008/03/11 05:34:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_uba.c,v 1.31 2010/11/13 13:52:10 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -41,8 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_uba.c,v 1.30 2008/03/11 05:34:01 matt Exp $");
 #include <sys/socket.h>
 #include <sys/device.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <net/if.h>
 
 #include <sys/bus.h>
diff --git a/sys/dev/qbus/qd.c b/sys/dev/qbus/qd.c
index 36ff00475a18..b8e0d1565532 100644
--- a/sys/dev/qbus/qd.c
+++ b/sys/dev/qbus/qd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: qd.c,v 1.50 2009/05/18 20:41:57 ad Exp $	*/
+/*	$NetBSD: qd.c,v 1.51 2010/11/13 13:52:10 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1988 Regents of the University of California.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.50 2009/05/18 20:41:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.51 2010/11/13 13:52:10 uebayasi Exp $");
 
 #include "opt_ddb.h"
 
@@ -73,8 +73,6 @@ __KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.50 2009/05/18 20:41:57 ad Exp $");
 #include <sys/poll.h>
 #include <sys/buf.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/cons.h>
 
 #include <sys/bus.h>
diff --git a/sys/dev/qbus/uba.c b/sys/dev/qbus/uba.c
index 57ab3419a406..ed519236f6be 100644
--- a/sys/dev/qbus/uba.c
+++ b/sys/dev/qbus/uba.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uba.c,v 1.78 2009/11/23 02:13:47 rmind Exp $	   */
+/*	$NetBSD: uba.c,v 1.79 2010/11/13 13:52:10 uebayasi Exp $	   */
 /*
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * All rights reserved.
@@ -69,7 +69,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uba.c,v 1.78 2009/11/23 02:13:47 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uba.c,v 1.79 2010/11/13 13:52:10 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
@@ -81,8 +81,6 @@ __KERNEL_RCSID(0, "$NetBSD: uba.c,v 1.78 2009/11/23 02:13:47 rmind Exp $");
 #include <sys/malloc.h>
 #include <sys/device.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bus.h>
 #include <machine/scb.h>
 #include <sys/cpu.h>
diff --git a/sys/dev/raidframe/rf_general.h b/sys/dev/raidframe/rf_general.h
index 829c3e7653cd..451aa71b5c04 100644
--- a/sys/dev/raidframe/rf_general.h
+++ b/sys/dev/raidframe/rf_general.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_general.h,v 1.17 2006/04/14 22:40:09 christos Exp $	*/
+/*	$NetBSD: rf_general.h,v 1.18 2010/11/13 13:52:10 uebayasi Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -42,7 +42,6 @@
 /* error reporting and handling */
 
 #include <sys/systm.h>		/* printf, sprintf, and friends */
-#include <uvm/uvm_extern.h>	/* PAGE_SIZE, PAGE_MASK */
 
 #define RF_ERRORMSG(s)            printf((s))
 #define RF_ERRORMSG1(s,a)         printf((s),(a))
diff --git a/sys/dev/sbus/agten.c b/sys/dev/sbus/agten.c
index fed00ae6d0bf..c215d4431a0c 100644
--- a/sys/dev/sbus/agten.c
+++ b/sys/dev/sbus/agten.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: agten.c,v 1.24 2010/01/29 23:50:01 macallan Exp $ */
+/*	$NetBSD: agten.c,v 1.25 2010/11/13 13:52:10 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agten.c,v 1.24 2010/01/29 23:50:01 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agten.c,v 1.25 2010/11/13 13:52:10 uebayasi Exp $");
 
 /*
  * a driver for the Fujitsu AG-10e SBus framebuffer
@@ -74,8 +74,6 @@ __KERNEL_RCSID(0, "$NetBSD: agten.c,v 1.24 2010/01/29 23:50:01 macallan Exp $");
 #include <dev/ic/i128reg.h>
 #include <dev/ic/i128var.h>
 
-#include <uvm/uvm_extern.h>
-
 #include "opt_agten.h"
 #include "ioconf.h"
 
diff --git a/sys/dev/sbus/zx.c b/sys/dev/sbus/zx.c
index 19e32a986269..12de4f76bd26 100644
--- a/sys/dev/sbus/zx.c
+++ b/sys/dev/sbus/zx.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: zx.c,v 1.36 2010/05/04 05:10:25 macallan Exp $	*/
+/*	$NetBSD: zx.c,v 1.37 2010/11/13 13:52:10 uebayasi Exp $	*/
 
 /*
  *  Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.36 2010/05/04 05:10:25 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.37 2010/11/13 13:52:10 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -61,8 +61,6 @@ __KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.36 2010/05/04 05:10:25 macallan Exp $");
 #include <sys/bus.h>
 #include <machine/autoconf.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/sun/fbio.h>
 #include <dev/sun/fbvar.h>
 
diff --git a/sys/dev/scsipi/scsipi_base.c b/sys/dev/scsipi/scsipi_base.c
index 047acfee3300..ec4d71d1042a 100644
--- a/sys/dev/scsipi/scsipi_base.c
+++ b/sys/dev/scsipi/scsipi_base.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: scsipi_base.c,v 1.154 2010/08/23 20:01:16 pooka Exp $	*/
+/*	$NetBSD: scsipi_base.c,v 1.155 2010/11/13 13:52:11 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.154 2010/08/23 20:01:16 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.155 2010/11/13 13:52:11 uebayasi Exp $");
 
 #include "opt_scsi.h"
 
@@ -48,8 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.154 2010/08/23 20:01:16 pooka Exp
 #include <sys/kthread.h>
 #include <sys/hash.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/scsipi/scsi_spc.h>
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsipi_disk.h>
diff --git a/sys/dev/sdmmc/ld_sdmmc.c b/sys/dev/sdmmc/ld_sdmmc.c
index 4eb2c782c701..7dc5d31cf8b1 100644
--- a/sys/dev/sdmmc/ld_sdmmc.c
+++ b/sys/dev/sdmmc/ld_sdmmc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ld_sdmmc.c,v 1.6 2010/09/23 12:03:27 kiyohara Exp $	*/
+/*	$NetBSD: ld_sdmmc.c,v 1.7 2010/11/13 13:52:11 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2008 KIYOHARA Takashi
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_sdmmc.c,v 1.6 2010/09/23 12:03:27 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_sdmmc.c,v 1.7 2010/11/13 13:52:11 uebayasi Exp $");
 
 #include "rnd.h"
 
@@ -48,8 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: ld_sdmmc.c,v 1.6 2010/09/23 12:03:27 kiyohara Exp $"
 #include <sys/rnd.h>
 #endif
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/ldvar.h>
 
 #include <dev/sdmmc/sdmmcvar.h>
diff --git a/sys/dev/sdmmc/sdmmc_mem.c b/sys/dev/sdmmc/sdmmc_mem.c
index 306f9e319dfa..42e8d4165136 100644
--- a/sys/dev/sdmmc/sdmmc_mem.c
+++ b/sys/dev/sdmmc/sdmmc_mem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdmmc_mem.c,v 1.13 2010/10/07 12:24:23 kiyohara Exp $	*/
+/*	$NetBSD: sdmmc_mem.c,v 1.14 2010/11/13 13:52:11 uebayasi Exp $	*/
 /*	$OpenBSD: sdmmc_mem.c,v 1.10 2009/01/09 10:55:22 jsg Exp $	*/
 
 /*
@@ -46,7 +46,7 @@
 /* Routines for SD/MMC memory cards. */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.13 2010/10/07 12:24:23 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.14 2010/11/13 13:52:11 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -54,8 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.13 2010/10/07 12:24:23 kiyohara Exp
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/sdmmc/sdmmcchip.h>
 #include <dev/sdmmc/sdmmcreg.h>
 #include <dev/sdmmc/sdmmcvar.h>
diff --git a/sys/dev/sun/bt_subr.c b/sys/dev/sun/bt_subr.c
index 420ec4339a6c..04080d5e2443 100644
--- a/sys/dev/sun/bt_subr.c
+++ b/sys/dev/sun/bt_subr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bt_subr.c,v 1.14 2009/09/12 19:39:12 tsutsui Exp $ */
+/*	$NetBSD: bt_subr.c,v 1.15 2010/11/13 13:52:11 uebayasi Exp $ */
 
 /*
  * Copyright (c) 1993
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bt_subr.c,v 1.14 2009/09/12 19:39:12 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bt_subr.c,v 1.15 2010/11/13 13:52:11 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -49,8 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: bt_subr.c,v 1.14 2009/09/12 19:39:12 tsutsui Exp $")
 #include <sys/errno.h>
 #include <sys/malloc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/sun/fbio.h>
 
 #include <dev/sun/btreg.h>
diff --git a/sys/dev/sun/cgsix.c b/sys/dev/sun/cgsix.c
index 8152189b2586..ec53a91a7f26 100644
--- a/sys/dev/sun/cgsix.c
+++ b/sys/dev/sun/cgsix.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgsix.c,v 1.48 2010/09/14 18:42:12 macallan Exp $ */
+/*	$NetBSD: cgsix.c,v 1.49 2010/11/13 13:52:11 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.48 2010/09/14 18:42:12 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.49 2010/11/13 13:52:11 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -95,8 +95,6 @@ __KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.48 2010/09/14 18:42:12 macallan Exp $");
 #include <sys/syslog.h>
 #endif
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bus.h>
 
 #include <dev/sun/fbio.h>
diff --git a/sys/dev/tc/asc_tcds.c b/sys/dev/tc/asc_tcds.c
index f88bb13b6393..ebc45829eb0d 100644
--- a/sys/dev/tc/asc_tcds.c
+++ b/sys/dev/tc/asc_tcds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: asc_tcds.c,v 1.24 2008/04/28 20:23:58 martin Exp $ */
+/* $NetBSD: asc_tcds.c,v 1.25 2010/11/13 13:52:11 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -60,15 +60,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: asc_tcds.c,v 1.24 2008/04/28 20:23:58 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asc_tcds.c,v 1.25 2010/11/13 13:52:11 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/buf.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsiconf.h>
diff --git a/sys/dev/tc/cfb.c b/sys/dev/tc/cfb.c
index fa11007a1f92..a9b21261f730 100644
--- a/sys/dev/tc/cfb.c
+++ b/sys/dev/tc/cfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cfb.c,v 1.59 2010/05/15 08:53:27 tsutsui Exp $ */
+/* $NetBSD: cfb.c,v 1.60 2010/11/13 13:52:12 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.59 2010/05/15 08:53:27 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.60 2010/11/13 13:52:12 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -52,8 +52,6 @@ __KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.59 2010/05/15 08:53:27 tsutsui Exp $");
 #include <dev/tc/tcvar.h>
 #include <dev/ic/bt459reg.h>
 
-#include <uvm/uvm_extern.h>
-
 #if defined(pmax)
 #define	machine_btop(x) mips_btop(MIPS_KSEG1_TO_PHYS(x))
 #endif
diff --git a/sys/dev/tc/mfb.c b/sys/dev/tc/mfb.c
index e66fe9454bd5..018acdbab050 100644
--- a/sys/dev/tc/mfb.c
+++ b/sys/dev/tc/mfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mfb.c,v 1.56 2010/05/15 08:53:27 tsutsui Exp $ */
+/* $NetBSD: mfb.c,v 1.57 2010/11/13 13:52:12 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.56 2010/05/15 08:53:27 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.57 2010/11/13 13:52:12 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -52,8 +52,6 @@ __KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.56 2010/05/15 08:53:27 tsutsui Exp $");
 #include <dev/tc/tcvar.h>
 #include <dev/ic/bt431reg.h>
 
-#include <uvm/uvm_extern.h>
-
 #if defined(pmax)
 #define	machine_btop(x) mips_btop(MIPS_KSEG1_TO_PHYS(x))
 #endif
diff --git a/sys/dev/tc/sfb.c b/sys/dev/tc/sfb.c
index 8dec624fdf2a..8c84e34d84f2 100644
--- a/sys/dev/tc/sfb.c
+++ b/sys/dev/tc/sfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sfb.c,v 1.82 2010/05/15 08:53:27 tsutsui Exp $ */
+/* $NetBSD: sfb.c,v 1.83 2010/11/13 13:52:12 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.82 2010/05/15 08:53:27 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.83 2010/11/13 13:52:12 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -53,8 +53,6 @@ __KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.82 2010/05/15 08:53:27 tsutsui Exp $");
 #include <dev/ic/bt459reg.h>
 #include <dev/tc/sfbreg.h>
 
-#include <uvm/uvm_extern.h>
-
 #if defined(pmax)
 #define	machine_btop(x) mips_btop(MIPS_KSEG1_TO_PHYS(x))
 #endif
diff --git a/sys/dev/tc/sfbplus.c b/sys/dev/tc/sfbplus.c
index 78d2b9258fc7..2db72c361a14 100644
--- a/sys/dev/tc/sfbplus.c
+++ b/sys/dev/tc/sfbplus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sfbplus.c,v 1.35 2010/05/15 08:53:27 tsutsui Exp $ */
+/* $NetBSD: sfbplus.c,v 1.36 2010/11/13 13:52:12 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.35 2010/05/15 08:53:27 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.36 2010/11/13 13:52:12 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -56,8 +56,6 @@ __KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.35 2010/05/15 08:53:27 tsutsui Exp $")
 #include <dev/tc/sfbreg.h>
 #include <dev/pci/tgareg.h>
 
-#include <uvm/uvm_extern.h>
-
 #if defined(pmax)
 #define	machine_btop(x) mips_btop(MIPS_KSEG1_TO_PHYS(x))
 #endif
diff --git a/sys/dev/tc/stic.c b/sys/dev/tc/stic.c
index 10a817eba233..11b5df0354e9 100644
--- a/sys/dev/tc/stic.c
+++ b/sys/dev/tc/stic.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: stic.c,v 1.47 2010/11/02 20:49:47 skrll Exp $	*/
+/*	$NetBSD: stic.c,v 1.48 2010/11/13 13:52:12 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stic.c,v 1.47 2010/11/02 20:49:47 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stic.c,v 1.48 2010/11/13 13:52:12 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -51,8 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: stic.c,v 1.47 2010/11/02 20:49:47 skrll Exp $");
 #include <sys/lwp.h>
 #include <sys/event.h>
 
-#include <uvm/uvm_extern.h>
-
 #if defined(pmax)
 #include <mips/cpuregs.h>
 #elif defined(alpha)
diff --git a/sys/dev/tc/tfb.c b/sys/dev/tc/tfb.c
index 3737a67125c8..171900a983d1 100644
--- a/sys/dev/tc/tfb.c
+++ b/sys/dev/tc/tfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tfb.c,v 1.59 2010/05/15 08:53:27 tsutsui Exp $ */
+/* $NetBSD: tfb.c,v 1.60 2010/11/13 13:52:12 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.59 2010/05/15 08:53:27 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.60 2010/11/13 13:52:12 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -53,8 +53,6 @@ __KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.59 2010/05/15 08:53:27 tsutsui Exp $");
 #include <dev/ic/bt463reg.h>
 #include <dev/ic/bt431reg.h>
 
-#include <uvm/uvm_extern.h>
-
 #if defined(pmax)
 #define	machine_btop(x) mips_btop(MIPS_KSEG1_TO_PHYS(x))
 #endif
diff --git a/sys/dev/tc/xcfb.c b/sys/dev/tc/xcfb.c
index 24c5549785d0..82a2af8da6ee 100644
--- a/sys/dev/tc/xcfb.c
+++ b/sys/dev/tc/xcfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xcfb.c,v 1.53 2010/05/15 08:53:27 tsutsui Exp $ */
+/* $NetBSD: xcfb.c,v 1.54 2010/11/13 13:52:12 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.53 2010/05/15 08:53:27 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.54 2010/11/13 13:52:12 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -54,8 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.53 2010/05/15 08:53:27 tsutsui Exp $");
 #include <dev/ic/ims332reg.h>
 #include <pmax/pmax/maxine.h>
 
-#include <uvm/uvm_extern.h>
-
 struct hwcmap256 {
 #define	CMAP_SIZE	256	/* 256 R/G/B entries */
 	uint8_t r[CMAP_SIZE];
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 274e06bac6f7..6a19b36ad7c5 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ohci.c,v 1.209 2010/11/03 22:34:23 dyoung Exp $	*/
+/*	$NetBSD: ohci.c,v 1.210 2010/11/13 13:52:12 uebayasi Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.209 2010/11/03 22:34:23 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.210 2010/11/13 13:52:12 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -49,7 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.209 2010/11/03 22:34:23 dyoung Exp $");
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/select.h>
-#include <uvm/uvm_extern.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 
diff --git a/sys/dev/usb/pseye.c b/sys/dev/usb/pseye.c
index f64561e5b65a..7f44b81cc200 100644
--- a/sys/dev/usb/pseye.c
+++ b/sys/dev/usb/pseye.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pseye.c,v 1.17 2010/11/03 22:34:23 dyoung Exp $ */
+/* $NetBSD: pseye.c,v 1.18 2010/11/13 13:52:12 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 2008 Jared D. McNeill <jmcneill@invisible.ca>
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.17 2010/11/03 22:34:23 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.18 2010/11/13 13:52:12 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -52,8 +52,6 @@ __KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.17 2010/11/03 22:34:23 dyoung Exp $");
 #include <sys/condvar.h>
 #include <sys/module.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 55db18bfbdd0..b5991363416d 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uhci.c,v 1.234 2010/11/03 22:34:23 dyoung Exp $	*/
+/*	$NetBSD: uhci.c,v 1.235 2010/11/13 13:52:12 uebayasi Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $	*/
 
 /*
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.234 2010/11/03 22:34:23 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.235 2010/11/13 13:52:12 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -51,7 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.234 2010/11/03 22:34:23 dyoung Exp $");
 #include <sys/device.h>
 #include <sys/select.h>
 #include <sys/extent.h>
-#include <uvm/uvm_extern.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/bus.h>
diff --git a/sys/dev/usb/usb_mem.c b/sys/dev/usb/usb_mem.c
index 18646eb029fc..00e3ff1d4007 100644
--- a/sys/dev/usb/usb_mem.c
+++ b/sys/dev/usb/usb_mem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb_mem.c,v 1.39 2010/11/03 22:34:24 dyoung Exp $	*/
+/*	$NetBSD: usb_mem.c,v 1.40 2010/11/13 13:52:12 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.39 2010/11/03 22:34:24 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.40 2010/11/13 13:52:12 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.39 2010/11/03 22:34:24 dyoung Exp $");
 
 #ifdef __NetBSD__
 #include <sys/extent.h>
-#include <uvm/uvm_extern.h>
 #endif
 
 #ifdef DIAGNOSTIC
diff --git a/sys/dev/xmi/xmi.c b/sys/dev/xmi/xmi.c
index 962cc2e49b04..10abfedc8617 100644
--- a/sys/dev/xmi/xmi.c
+++ b/sys/dev/xmi/xmi.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: xmi.c,v 1.10 2008/03/11 05:34:02 matt Exp $	*/
+/*	$NetBSD: xmi.c,v 1.11 2010/11/13 13:52:13 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -35,14 +35,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xmi.c,v 1.10 2008/03/11 05:34:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xmi.c,v 1.11 2010/11/13 13:52:13 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/bus.h>
 #include <sys/cpu.h>