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

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

details:   https://anonhg.NetBSD.org/src/rev/17f470628beb
branches:  trunk
changeset: 789421:17f470628beb
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Aug 18 21:50:31 2013 +0000

description:
Fix <arm/locore.h> lossage

diffstat:

 sys/arch/epoc32/epoc32/intr.c               |   7 ++++---
 sys/arch/epoc32/epoc32/machdep.c            |  14 +++++++-------
 sys/arch/hpcarm/hpcarm/hpc_machdep.c        |   7 ++++---
 sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c |  11 +++++------
 sys/arch/iyonix/iyonix/iyonix_machdep.c     |  16 ++++++++--------
 5 files changed, 28 insertions(+), 27 deletions(-)

diffs (198 lines):

diff -r 6f05e049f23b -r 17f470628beb sys/arch/epoc32/epoc32/intr.c
--- a/sys/arch/epoc32/epoc32/intr.c     Sun Aug 18 21:42:16 2013 +0000
+++ b/sys/arch/epoc32/epoc32/intr.c     Sun Aug 18 21:50:31 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.c,v 1.1 2013/04/28 12:11:26 kiyohara Exp $        */
+/*     $NetBSD: intr.c,v 1.2 2013/08/18 21:57:01 matt Exp $    */
 /*
  * Copyright (c) 2012 KIYOHARA Takashi
  * All rights reserved.
@@ -26,11 +26,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.1 2013/04/28 12:11:26 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.2 2013/08/18 21:57:01 matt Exp $");
 
 #include <sys/systm.h>
+#include <sys/cpu.h>
 
-#include <machine/cpu.h>
+#include <arm/locore.h>
 
 #include <arm/pic/picvar.h>
 
diff -r 6f05e049f23b -r 17f470628beb sys/arch/epoc32/epoc32/machdep.c
--- a/sys/arch/epoc32/epoc32/machdep.c  Sun Aug 18 21:42:16 2013 +0000
+++ b/sys/arch/epoc32/epoc32/machdep.c  Sun Aug 18 21:50:31 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.2 2013/06/20 13:40:09 kiyohara Exp $     */
+/*     $NetBSD: machdep.c,v 1.3 2013/08/18 21:57:01 matt Exp $ */
 /*
  * Copyright (c) 2012, 2013 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.2 2013/06/20 13:40:09 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.3 2013/08/18 21:57:01 matt Exp $");
 
 #include "clpscom.h"
 #include "clpslcd.h"
@@ -50,10 +50,13 @@
 
 #include <uvm/uvm_extern.h>
 
+#include <dev/cons.h>
+#include <dev/md.h>
+
+#include <arm/locore.h>
+#include <arm/undefined.h>
 #include <arm/arm32/machdep.h>
 #include <arm/arm32/pmap.h>
-#include <arm/cpufunc.h>
-#include <arm/undefined.h>
 
 #include <machine/bootconfig.h>
 #include <machine/bootinfo.h>
@@ -64,9 +67,6 @@
 #include <epoc32/windermere/windermerereg.h>
 #include <epoc32/dev/epockbdvar.h>
 
-#include <dev/cons.h>
-#include <dev/md.h>
-
 #include <machine/db_machdep.h>
 #include <ddb/db_extern.h>
 
diff -r 6f05e049f23b -r 17f470628beb sys/arch/hpcarm/hpcarm/hpc_machdep.c
--- a/sys/arch/hpcarm/hpcarm/hpc_machdep.c      Sun Aug 18 21:42:16 2013 +0000
+++ b/sys/arch/hpcarm/hpcarm/hpc_machdep.c      Sun Aug 18 21:50:31 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hpc_machdep.c,v 1.101 2012/07/29 00:07:06 matt Exp $   */
+/*     $NetBSD: hpc_machdep.c,v 1.102 2013/08/18 22:26:51 matt Exp $   */
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.101 2012/07/29 00:07:06 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.102 2013/08/18 22:26:51 matt Exp $");
 
 #include "opt_cputypes.h"
 #include "opt_kloader.h"
@@ -54,10 +54,11 @@
 #include <sys/mount.h>
 #include <sys/pmf.h>
 #include <sys/reboot.h>
+#include <sys/cpu.h>
 
 #include <uvm/uvm.h>
 
-#include <arm/cpufunc.h>
+#include <arm/locore.h>
 
 #include <machine/bootconfig.h>
 #include <machine/bootinfo.h>
diff -r 6f05e049f23b -r 17f470628beb sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c
--- a/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c       Sun Aug 18 21:42:16 2013 +0000
+++ b/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c       Sun Aug 18 21:50:31 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sa11x0_hpc_machdep.c,v 1.7 2012/09/22 00:33:41 matt Exp $      */
+/*     $NetBSD: sa11x0_hpc_machdep.c,v 1.8 2013/08/18 22:26:51 matt Exp $      */
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.7 2012/09/22 00:33:41 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.8 2013/08/18 22:26:51 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_dram_pages.h"
@@ -60,6 +60,8 @@
 #include <sys/device.h>
 #include <sys/termios.h>
 #include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
 
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 #include <machine/db_machdep.h>
@@ -76,14 +78,11 @@
 
 #include <arm/arm32/machdep.h>
 #include <arm/sa11x0/sa11x0_reg.h>
-#include <arm/cpuconf.h>
+#include <arm/locore.h>
 #include <arm/undefined.h>
 
 #include <machine/bootconfig.h>
 #include <machine/bootinfo.h>
-#include <machine/cpu.h>
-#include <machine/frame.h>
-#include <machine/intr.h>
 #include <machine/io.h>
 #include <machine/platid.h>
 #include <machine/platid_mask.h>
diff -r 6f05e049f23b -r 17f470628beb sys/arch/iyonix/iyonix/iyonix_machdep.c
--- a/sys/arch/iyonix/iyonix/iyonix_machdep.c   Sun Aug 18 21:42:16 2013 +0000
+++ b/sys/arch/iyonix/iyonix/iyonix_machdep.c   Sun Aug 18 21:50:31 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iyonix_machdep.c,v 1.21 2012/09/22 00:33:41 matt Exp $ */
+/*     $NetBSD: iyonix_machdep.c,v 1.22 2013/08/18 21:50:31 matt Exp $ */
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.21 2012/09/22 00:33:41 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.22 2013/08/18 21:50:31 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -89,11 +89,16 @@
 #include <sys/reboot.h>
 #include <sys/termios.h>
 #include <sys/ksyms.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
 
 #include <uvm/uvm_extern.h>
 
 #include <dev/cons.h>
 
+#include <dev/pci/ppbreg.h>
+#include <dev/ic/i8259reg.h>
+
 #include <net/if.h>
 #include <net/if_ether.h>
 
@@ -102,9 +107,7 @@
 #include <ddb/db_extern.h>
 
 #include <acorn32/include/bootconfig.h>
-#include <sys/bus.h>
-#include <machine/cpu.h>
-#include <machine/frame.h>
+#include <arm/locore.h>
 #include <arm/undefined.h>
 
 #include <arm/arm32/machdep.h>
@@ -115,9 +118,6 @@
 #include <iyonix/iyonix/iyonixreg.h>
 #include <iyonix/iyonix/obiovar.h>
 
-#include <dev/pci/ppbreg.h>
-#include <dev/ic/i8259reg.h>
-
 #include "ksyms.h"
 
 #define        KERNEL_TEXT_BASE        KERNEL_BASE