[src/uebayasi-xip]: src/sys/arch Fix build.

[uebayasi <uebayasi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7792c9b9b073
branches:  uebayasi-xip
changeset: 751712:7792c9b9b073
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Thu May 27 14:47:28 2010 +0000

description:
Fix build.

diffstat:

 sys/arch/alpha/alpha/machdep.c          |  6 +++---
 sys/arch/atari/atari/bus.c              |  6 +++---
 sys/arch/landisk/landisk/bus_dma.c      |  6 +++---
 sys/arch/mips/mips/mips_machdep.c       |  6 +++---
 sys/arch/powerpc/oea/cpu_subr.c         |  6 +++---
 sys/arch/powerpc/powerpc/bus_dma.c      |  6 +++---
 sys/arch/powerpc/powerpc/pmap_subr.c    |  6 +++---
 sys/arch/sh3/sh3/mem.c                  |  6 +++---
 sys/arch/sh3/sh3/sh3_machdep.c          |  6 +++---
 sys/arch/sparc/sparc/db_interface.c     |  6 +++---
 sys/arch/sparc64/dev/iommu.c            |  6 +++---
 sys/arch/sparc64/sparc64/cpu.c          |  6 +++---
 sys/arch/sparc64/sparc64/db_interface.c |  6 +++---
 sys/arch/vax/include/db_machdep.h       |  4 ++--
 sys/arch/vax/include/pmap.h             |  4 +++-
 sys/arch/vax/vax/pmap.c                 |  6 +++---
 16 files changed, 47 insertions(+), 45 deletions(-)

diffs (truncated from 414 to 300 lines):

diff -r b78852234e0f -r 7792c9b9b073 sys/arch/alpha/alpha/machdep.c
--- a/sys/arch/alpha/alpha/machdep.c    Thu May 27 04:44:08 2010 +0000
+++ b/sys/arch/alpha/alpha/machdep.c    Thu May 27 14:47:28 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.325.2.2 2010/04/30 14:39:02 uebayasi Exp $ */
+/* $NetBSD: machdep.c,v 1.325.2.3 2010/05/27 14:47:28 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.325.2.2 2010/04/30 14:39:02 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.325.2.3 2010/05/27 14:47:28 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -105,7 +105,7 @@
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
 #include <sys/sysctl.h>
 
 #include <dev/cons.h>
diff -r b78852234e0f -r 7792c9b9b073 sys/arch/atari/atari/bus.c
--- a/sys/arch/atari/atari/bus.c        Thu May 27 04:44:08 2010 +0000
+++ b/sys/arch/atari/atari/bus.c        Thu May 27 14:47:28 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus.c,v 1.51.2.1 2010/04/30 14:39:09 uebayasi Exp $    */
+/*     $NetBSD: bus.c,v 1.51.2.2 2010/05/27 14:47:29 uebayasi Exp $    */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.51.2.1 2010/04/30 14:39:09 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.51.2.2 2010/05/27 14:47:29 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -40,7 +40,7 @@
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
 
 #include <machine/cpu.h>
 #include <m68k/cacheops.h>
diff -r b78852234e0f -r 7792c9b9b073 sys/arch/landisk/landisk/bus_dma.c
--- a/sys/arch/landisk/landisk/bus_dma.c        Thu May 27 04:44:08 2010 +0000
+++ b/sys/arch/landisk/landisk/bus_dma.c        Thu May 27 14:47:28 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_dma.c,v 1.8.2.1 2010/04/30 14:39:32 uebayasi Exp $ */
+/*     $NetBSD: bus_dma.c,v 1.8.2.2 2010/05/27 14:47:29 uebayasi Exp $ */
 
 /*
  * Copyright (c) 2005 NONAKA Kimihiro
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.8.2.1 2010/04/30 14:39:32 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.8.2.2 2010/05/27 14:47:29 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -35,7 +35,7 @@
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
 
 #include <sh3/cache.h>
 
diff -r b78852234e0f -r 7792c9b9b073 sys/arch/mips/mips/mips_machdep.c
--- a/sys/arch/mips/mips/mips_machdep.c Thu May 27 04:44:08 2010 +0000
+++ b/sys/arch/mips/mips/mips_machdep.c Thu May 27 14:47:28 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mips_machdep.c,v 1.225.2.2 2010/04/30 14:39:36 uebayasi Exp $  */
+/*     $NetBSD: mips_machdep.c,v 1.225.2.3 2010/05/27 14:47:29 uebayasi Exp $  */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -112,7 +112,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.225.2.2 2010/04/30 14:39:36 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.225.2.3 2010/05/27 14:47:29 uebayasi Exp $");
 
 #include "opt_cputype.h"
 #include "opt_compat_netbsd32.h"
@@ -144,7 +144,7 @@
 #include <compat/netbsd32/netbsd32.h>
 #endif
 
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
 
 #include <dev/cons.h>
 
diff -r b78852234e0f -r 7792c9b9b073 sys/arch/powerpc/oea/cpu_subr.c
--- a/sys/arch/powerpc/oea/cpu_subr.c   Thu May 27 04:44:08 2010 +0000
+++ b/sys/arch/powerpc/oea/cpu_subr.c   Thu May 27 14:47:28 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu_subr.c,v 1.54.2.1 2010/04/30 14:39:44 uebayasi Exp $       */
+/*     $NetBSD: cpu_subr.c,v 1.54.2.2 2010/05/27 14:47:29 uebayasi Exp $       */
 
 /*-
  * Copyright (c) 2001 Matt Thomas.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.54.2.1 2010/04/30 14:39:44 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.54.2.2 2010/05/27 14:47:29 uebayasi Exp $");
 
 #include "opt_ppcparam.h"
 #include "opt_multiprocessor.h"
@@ -48,7 +48,7 @@
 #include <sys/lwp.h>
 #include <sys/malloc.h>
 
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
 
 #include <powerpc/spr.h>
 #include <powerpc/oea/hid.h>
diff -r b78852234e0f -r 7792c9b9b073 sys/arch/powerpc/powerpc/bus_dma.c
--- a/sys/arch/powerpc/powerpc/bus_dma.c        Thu May 27 04:44:08 2010 +0000
+++ b/sys/arch/powerpc/powerpc/bus_dma.c        Thu May 27 14:47:28 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_dma.c,v 1.35.2.1 2010/04/28 08:31:07 uebayasi Exp $        */
+/*     $NetBSD: bus_dma.c,v 1.35.2.2 2010/05/27 14:47:29 uebayasi Exp $        */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.35.2.1 2010/04/28 08:31:07 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.35.2.2 2010/05/27 14:47:29 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -41,7 +41,7 @@
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
 
 #define _POWERPC_BUS_DMA_PRIVATE
 #include <machine/bus.h>
diff -r b78852234e0f -r 7792c9b9b073 sys/arch/powerpc/powerpc/pmap_subr.c
--- a/sys/arch/powerpc/powerpc/pmap_subr.c      Thu May 27 04:44:08 2010 +0000
+++ b/sys/arch/powerpc/powerpc/pmap_subr.c      Thu May 27 14:47:28 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap_subr.c,v 1.22.2.1 2010/02/26 14:40:23 uebayasi Exp $      */
+/*     $NetBSD: pmap_subr.c,v 1.22.2.2 2010/05/27 14:47:29 uebayasi Exp $      */
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_subr.c,v 1.22.2.1 2010/02/26 14:40:23 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_subr.c,v 1.22.2.2 2010/05/27 14:47:29 uebayasi Exp $");
 
 #include "opt_multiprocessor.h"
 #include "opt_altivec.h"
@@ -41,7 +41,7 @@
 #include <sys/device.h>
 #include <sys/systm.h>
 
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
 
 #if defined (PPC_OEA) || defined (PPC_OEA64) || defined (PPC_OEA64_BRIDGE)
 #include <powerpc/oea/vmparam.h>
diff -r b78852234e0f -r 7792c9b9b073 sys/arch/sh3/sh3/mem.c
--- a/sys/arch/sh3/sh3/mem.c    Thu May 27 04:44:08 2010 +0000
+++ b/sys/arch/sh3/sh3/mem.c    Thu May 27 14:47:28 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mem.c,v 1.26.64.1 2010/04/28 08:31:07 uebayasi Exp $   */
+/*     $NetBSD: mem.c,v 1.26.64.2 2010/05/27 14:47:29 uebayasi Exp $   */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.26.64.1 2010/04/28 08:31:07 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.26.64.2 2010/05/27 14:47:29 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -90,7 +90,7 @@
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/kauth.h>
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
 
 void *zeropage;
 bool __mm_mem_addr(paddr_t);
diff -r b78852234e0f -r 7792c9b9b073 sys/arch/sh3/sh3/sh3_machdep.c
--- a/sys/arch/sh3/sh3/sh3_machdep.c    Thu May 27 04:44:08 2010 +0000
+++ b/sys/arch/sh3/sh3/sh3_machdep.c    Thu May 27 14:47:28 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sh3_machdep.c,v 1.85.2.1 2010/04/30 14:39:48 uebayasi Exp $    */
+/*     $NetBSD: sh3_machdep.c,v 1.85.2.2 2010/05/27 14:47:29 uebayasi Exp $    */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.85.2.1 2010/04/30 14:39:48 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.85.2.2 2010/05/27 14:47:29 uebayasi Exp $");
 
 #include "opt_kgdb.h"
 #include "opt_memsize.h"
@@ -95,7 +95,7 @@
 const char kgdb_devname[] = KGDB_DEVNAME;
 #endif /* KGDB */
 
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
 
 #include <sh3/cache.h>
 #include <sh3/clock.h>
diff -r b78852234e0f -r 7792c9b9b073 sys/arch/sparc/sparc/db_interface.c
--- a/sys/arch/sparc/sparc/db_interface.c       Thu May 27 04:44:08 2010 +0000
+++ b/sys/arch/sparc/sparc/db_interface.c       Thu May 27 14:47:28 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_interface.c,v 1.86 2010/01/10 08:24:32 mrg Exp $ */
+/*     $NetBSD: db_interface.c,v 1.86.2.1 2010/05/27 14:47:30 uebayasi Exp $ */
 
 /*
  * Mach Operating System
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.86 2010/01/10 08:24:32 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.86.2.1 2010/05/27 14:47:30 uebayasi Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -47,7 +47,7 @@
 
 #include <dev/cons.h>
 
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
 
 #include <machine/db_machdep.h>
 
diff -r b78852234e0f -r 7792c9b9b073 sys/arch/sparc64/dev/iommu.c
--- a/sys/arch/sparc64/dev/iommu.c      Thu May 27 04:44:08 2010 +0000
+++ b/sys/arch/sparc64/dev/iommu.c      Thu May 27 14:47:28 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iommu.c,v 1.96.2.1 2010/04/30 14:39:51 uebayasi Exp $  */
+/*     $NetBSD: iommu.c,v 1.96.2.2 2010/05/27 14:47:30 uebayasi Exp $  */
 
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.96.2.1 2010/04/30 14:39:51 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.96.2.2 2010/05/27 14:47:30 uebayasi Exp $");
 
 #include "opt_ddb.h"
 
@@ -70,7 +70,7 @@
 #include <sys/device.h>
 #include <sys/proc.h>
 
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
 
 #include <machine/bus.h>
 #include <sparc64/dev/iommureg.h>
diff -r b78852234e0f -r 7792c9b9b073 sys/arch/sparc64/sparc64/cpu.c
--- a/sys/arch/sparc64/sparc64/cpu.c    Thu May 27 04:44:08 2010 +0000
+++ b/sys/arch/sparc64/sparc64/cpu.c    Thu May 27 14:47:28 2010 +0000