[src/trunk]: src/sys/arch Fix more <arm/locore.h> lossage

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

details:   https://anonhg.NetBSD.org/src/rev/6f05e049f23b
branches:  trunk
changeset: 789420:6f05e049f23b
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Aug 18 21:42:16 2013 +0000

description:
Fix more <arm/locore.h> lossage

diffstat:

 sys/arch/acorn32/acorn32/rpc_machdep.c           |  33 ++++++------
 sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c   |  27 ++++-----
 sys/arch/netwinder/netwinder/netwinder_machdep.c |  64 ++++++++++++-----------
 sys/arch/zaurus/zaurus/machdep.c                 |  18 +++---
 4 files changed, 71 insertions(+), 71 deletions(-)

diffs (truncated from 308 to 300 lines):

diff -r 7fe9917aadf3 -r 6f05e049f23b sys/arch/acorn32/acorn32/rpc_machdep.c
--- a/sys/arch/acorn32/acorn32/rpc_machdep.c    Sun Aug 18 20:48:17 2013 +0000
+++ b/sys/arch/acorn32/acorn32/rpc_machdep.c    Sun Aug 18 21:42:16 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rpc_machdep.c,v 1.86 2012/09/22 00:33:36 matt Exp $    */
+/*     $NetBSD: rpc_machdep.c,v 1.87 2013/08/18 21:42:16 matt Exp $    */
 
 /*
  * Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -55,7 +55,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.86 2012/09/22 00:33:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.87 2013/08/18 21:42:16 matt Exp $");
 
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -66,39 +66,38 @@
 #include <sys/exec_aout.h>
 #include <sys/ksyms.h>
 #include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/device.h>
 
 #include <dev/cons.h>
 
+#include <dev/ic/pckbcvar.h>
+
+#include <dev/i2c/i2cvar.h>
+#include <dev/i2c/pcf8583var.h>
+
 #include <machine/db_machdep.h>
 #include <ddb/db_sym.h>
 #include <ddb/db_extern.h>
 
 #include <uvm/uvm.h>
 
-#include <machine/signal.h>
-#include <machine/frame.h>
-#include <machine/bootconfig.h>
-#include <machine/cpu.h>
-#include <machine/io.h>
-#include <machine/intr.h>
-#include <arm/cpuconf.h>
+#include <arm/locore.h>
+#include <arm/undefined.h>
 #include <arm/arm32/katelib.h>
 #include <arm/arm32/machdep.h>
 #include <arm/arm32/pmap.h>
-#include <arm/undefined.h>
+
 #include <machine/rtc.h>
+#include <machine/signal.h>
+#include <machine/bootconfig.h>
+#include <machine/io.h>
 
 #include <arm/iomd/vidc.h>
 #include <arm/iomd/iomdreg.h>
 #include <arm/iomd/iomdvar.h>
-
 #include <arm/iomd/vidcvideo.h>
-
-#include <sys/device.h>
-#include <dev/ic/pckbcvar.h>
-
-#include <dev/i2c/i2cvar.h>
-#include <dev/i2c/pcf8583var.h>
 #include <arm/iomd/iomdiicvar.h>
 
 static i2c_tag_t acorn32_i2c_tag;
diff -r 7fe9917aadf3 -r 6f05e049f23b sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
--- a/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c    Sun Aug 18 20:48:17 2013 +0000
+++ b/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c    Sun Aug 18 21:42:16 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: eb7500atx_machdep.c,v 1.25 2012/09/22 00:33:37 matt Exp $      */
+/*     $NetBSD: eb7500atx_machdep.c,v 1.26 2013/08/18 21:42:16 matt Exp $      */
 
 /*
  * Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -55,7 +55,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.25 2012/09/22 00:33:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.26 2013/08/18 21:42:16 matt Exp $");
 
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -66,38 +66,37 @@
 #include <sys/exec_aout.h>
 #include <sys/ksyms.h>
 #include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/device.h>
 
 #include <dev/cons.h>
 
+#include <dev/ic/pckbcvar.h>
+
+#include <dev/i2c/i2cvar.h>
+#include <dev/i2c/pcf8583var.h>
+
 #include <machine/db_machdep.h>
 #include <ddb/db_sym.h>
 #include <ddb/db_extern.h>
 
 #include <uvm/uvm.h>
 
+#include <arm/locore.h>
+#include <arm/undefined.h>
+
 #include <machine/signal.h>
-#include <machine/frame.h>
 #include <machine/bootconfig.h>
-#include <machine/cpu.h>
 #include <machine/io.h>
-#include <machine/intr.h>
-#include <arm/cpuconf.h>
 #include <arm/arm32/katelib.h>
 #include <arm/arm32/machdep.h>
-#include <arm/undefined.h>
 #include <machine/rtc.h>
 
 #include <arm/iomd/vidc.h>
 #include <arm/iomd/iomdreg.h>
 #include <arm/iomd/iomdvar.h>
-
 #include <arm/iomd/vidcvideo.h>
-
-#include <sys/device.h>
-#include <dev/ic/pckbcvar.h>
-
-#include <dev/i2c/i2cvar.h>
-#include <dev/i2c/pcf8583var.h>
 #include <arm/iomd/iomdiicvar.h>
 
 /* static i2c_tag_t acorn32_i2c_tag;*/
diff -r 7fe9917aadf3 -r 6f05e049f23b sys/arch/netwinder/netwinder/netwinder_machdep.c
--- a/sys/arch/netwinder/netwinder/netwinder_machdep.c  Sun Aug 18 20:48:17 2013 +0000
+++ b/sys/arch/netwinder/netwinder/netwinder_machdep.c  Sun Aug 18 21:42:16 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netwinder_machdep.c,v 1.80 2012/10/13 17:58:55 jdc Exp $       */
+/*     $NetBSD: netwinder_machdep.c,v 1.81 2013/08/18 21:42:16 matt Exp $      */
 
 /*
  * Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,11 +40,20 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netwinder_machdep.c,v 1.80 2012/10/13 17:58:55 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netwinder_machdep.c,v 1.81 2013/08/18 21:42:16 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
 
+#define        _ARM32_BUS_DMA_PRIVATE
+
+#include "isa.h"
+#include "isadma.h"
+#include "igsfb.h"
+#include "pckbc.h"
+#include "com.h"
+#include "ksyms.h"
+
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
@@ -55,11 +64,32 @@
 #include <sys/reboot.h>
 #include <sys/termios.h>
 #include <sys/ksyms.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
 
 #include <uvm/uvm_extern.h>
 
 #include <dev/cons.h>
 
+#if NISA > 0
+#include <dev/isa/isareg.h>
+#include <dev/isa/isavar.h>
+#endif
+
+#if NIGSFB > 0
+#include <dev/pci/pcivar.h>
+#include <dev/pci/igsfb_pcivar.h>
+#endif
+
+#if NPCKBC > 0
+#include <dev/ic/i8042reg.h>
+#include <dev/ic/pckbcvar.h>
+#endif
+
+#include <dev/ic/comreg.h>
+#include <dev/ic/comvar.h>
+
 #include <machine/db_machdep.h>
 #include <ddb/db_sym.h>
 #include <ddb/db_extern.h>
@@ -67,41 +97,13 @@
 #include <arm/arm32/machdep.h>
 
 #include <machine/bootconfig.h>
-#define        _ARM32_BUS_DMA_PRIVATE
-#include <sys/bus.h>
-#include <machine/cpu.h>
-#include <machine/frame.h>
-#include <machine/intr.h>
+#include <arm/locore.h>
 #include <arm/undefined.h>
 
 #include <machine/netwinder_boot.h>
 #include <arm/footbridge/dc21285mem.h>
 #include <arm/footbridge/dc21285reg.h>
 
-#include "isa.h"
-#include "isadma.h"
-#if NISA > 0
-#include <dev/isa/isareg.h>
-#include <dev/isa/isavar.h>
-#endif
-
-#include "igsfb.h"
-#if NIGSFB > 0
-#include <dev/pci/pcivar.h>
-#include <dev/pci/igsfb_pcivar.h>
-#endif
-
-#include "pckbc.h"
-#if NPCKBC > 0
-#include <dev/ic/i8042reg.h>
-#include <dev/ic/pckbcvar.h>
-#endif
-
-#include "com.h"
-#include <dev/ic/comreg.h>
-#include <dev/ic/comvar.h>
-
-#include "ksyms.h"
 
 static bus_space_handle_t isa_base = (bus_space_handle_t) DC21285_PCI_IO_VBASE;
 
diff -r 7fe9917aadf3 -r 6f05e049f23b sys/arch/zaurus/zaurus/machdep.c
--- a/sys/arch/zaurus/zaurus/machdep.c  Sun Aug 18 20:48:17 2013 +0000
+++ b/sys/arch/zaurus/zaurus/machdep.c  Sun Aug 18 21:42:16 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.34 2012/09/22 00:33:42 matt Exp $        */
+/*     $NetBSD: machdep.c,v 1.35 2013/08/18 21:42:16 matt Exp $        */
 /*     $OpenBSD: zaurus_machdep.c,v 1.25 2006/06/20 18:24:04 todd Exp $        */
 
 /*
@@ -107,7 +107,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.34 2012/09/22 00:33:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.35 2013/08/18 21:42:16 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -132,13 +132,16 @@
 #include <sys/reboot.h>
 #include <sys/termios.h>
 #include <sys/boot_flag.h>
+#include <sys/cpu.h>
+#include <sys/conf.h>
+#include <sys/queue.h>
+#include <sys/bus.h>
 
 #include <uvm/uvm_extern.h>
 
 #include <dev/cons.h>
-#include <sys/conf.h>
-#include <sys/queue.h>
-#include <sys/bus.h>
+
+#include <dev/ic/comreg.h>
 
 #include <machine/db_machdep.h>
 #include <ddb/db_sym.h>
@@ -149,12 +152,11 @@
 
 #include <machine/bootconfig.h>
 #include <machine/bootinfo.h>
-#include <machine/cpu.h>
-#include <machine/frame.h>
 #ifdef KLOADER
 #include <machine/kloader.h>
 #endif
 
+#include <arm/locore.h>
 #include <arm/undefined.h>
 #include <arm/arm32/machdep.h>
 
@@ -172,8 +174,6 @@