From 213e0bd398748286d42be687e4539c5cddbe10aa Mon Sep 17 00:00:00 2001
From: matt <matt@NetBSD.org>
Date: Sun, 18 Aug 2013 15:58:19 +0000
Subject: [PATCH] <arm/locore.h> fallout (fixes some include ordering errors)

---
 sys/arch/arm/arm/cpu_in_cksum.S               | 144 ++++++++++--------
 sys/arch/arm/at91/at91bus.c                   |  19 +--
 sys/arch/arm/ep93xx/ep93xx_intr.c             |   8 +-
 sys/arch/arm/gemini/gemini_pci.c              |  27 ++--
 sys/arch/arm/include/cpu.h                    |   4 +
 sys/arch/arm/ixp12x0/ixp12x0_intr.c           |   9 +-
 sys/arch/arm/ixp12x0/ixp12x0_pci.c            |  10 +-
 sys/arch/arm/omap/omap_intr.h                 |   4 +-
 sys/arch/arm/s3c2xx0/s3c2800_pci.c            |  17 ++-
 sys/arch/arm/xscale/becc_pci.c                |  20 +--
 sys/arch/arm/xscale/i80312_pci.c              |  20 +--
 sys/arch/arm/xscale/i80321_pci.c              |  22 +--
 sys/arch/evbarm/adi_brh/brh_machdep.c         |  10 +-
 .../evbarm/armadillo/armadillo9_machdep.c     |  10 +-
 sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c     |   8 +-
 sys/arch/evbarm/gemini/gemini_machdep.c       |  16 +-
 sys/arch/evbarm/gumstix/gumstix_machdep.c     |  10 +-
 sys/arch/evbarm/gumstix/gumstix_start.S       |   6 +-
 sys/arch/evbarm/hdl_g/hdlg_machdep.c          |  10 +-
 sys/arch/evbarm/ifpga/ifpgavar.h              |   3 +-
 sys/arch/evbarm/imx31/imx31lk_machdep.c       |  10 +-
 .../evbarm/integrator/integrator_machdep.c    |  12 +-
 sys/arch/evbarm/iq80310/iq80310_machdep.c     |  10 +-
 sys/arch/evbarm/iq80321/iq80321_machdep.c     |  15 +-
 sys/arch/evbarm/iq80321/iq80321_pci.c         |  14 +-
 sys/arch/evbarm/ixdp425/ixdp425_machdep.c     |  10 +-
 sys/arch/evbarm/ixm1200/ixm1200_machdep.c     |  10 +-
 sys/arch/evbarm/lubbock/lubbock_machdep.c     |  12 +-
 sys/arch/evbarm/mpcsa/mpcsa_machdep.c         |  22 +--
 sys/arch/evbarm/netwalker/netwalker_machdep.c |  12 +-
 sys/arch/evbarm/osk5912/osk5912_machdep.c     |  12 +-
 sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c   |  12 +-
 sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c   |  12 +-
 sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c   |  11 +-
 sys/arch/evbarm/tsarm/tsarm_machdep.c         |  10 +-
 sys/arch/evbarm/viper/viper_machdep.c         |  10 +-
 36 files changed, 304 insertions(+), 267 deletions(-)

diff --git a/sys/arch/arm/arm/cpu_in_cksum.S b/sys/arch/arm/arm/cpu_in_cksum.S
index 1fc00dbf9f9f..84742a22a3cf 100644
--- a/sys/arch/arm/arm/cpu_in_cksum.S
+++ b/sys/arch/arm/arm/cpu_in_cksum.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu_in_cksum.S,v 1.5 2013/08/18 05:54:16 matt Exp $	*/
+/*	$NetBSD: cpu_in_cksum.S,v 1.6 2013/08/18 15:58:19 matt Exp $	*/
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <machine/asm.h>
-RCSID("$NetBSD: cpu_in_cksum.S,v 1.5 2013/08/18 05:54:16 matt Exp $")
+RCSID("$NetBSD: cpu_in_cksum.S,v 1.6 2013/08/18 15:58:19 matt Exp $")
 	
 #include "assym.h"
 
@@ -91,26 +91,44 @@ ENTRY(cpu_in_cksum)
 	ldr	ip, [ip, #(M_NEXT)]
 .Lin_cksum_entry:
 	cmp	r9, r1
+#ifdef __thumb__
+	bge	1f
+	mov	r1, r9
+#else
 	movlt	r1, r9
-	sub	r9, r9, r1
+#endif
+1:	sub	r9, r9, r1
 	eor	r11, r10, r0
 	add	r10, r10, r1
 	adds	r2, r1, #0x00
+#ifdef __thumb__
+	it	ne
+#endif
 	blne	_ASM_LABEL(.L_cksumdata)
 	tst	r11, #0x01
+#ifdef __thumb__
+	it	ne
+#endif
 	movne	r2, r2, ror #8
 	adds	r8, r8, r2
 	adc	r8, r8, #0x00
 	cmp	ip, #00
 	bne	.Lin_cksum_loop
-	
-	mov	r1, #0xff
-	orr	r1, r1, #0xff00
-	and	r0, r8, r1
-	add	r0, r0, r8, lsr #16
-	add	r0, r0, r0, lsr #16
-	and	r0, r0, r1
-	eor	r0, r0, r1
+
+#ifdef __thumb__
+	mov	r0, r8
+	lsls	r2, r0, #16
+	adds	r0, r0, r2
+	bcc	1f
+	adds	r0, r0, #65536
+1:	mvns	r0, r0
+	lsrs	r0, r0, #16
+#else
+	adds	r8, r8, r8, lsl #16
+	addcs	r8, r8, #65536
+	mvn	r0, r8
+	lsr	r0, r0, #16
+#endif
 	pop	{r4-r11, lr}
 	RET
 
@@ -145,37 +163,49 @@ ASENTRY_NP(.L_cksumdata)
 #ifdef __XSCALE__
 	pld	[r0]			/* Pre-fetch the start of the buffer */
 #endif
-	mov	r2, #0
+	movs	r2, #0
 
 	/* We first have to word-align the buffer.  */
 	ands	r7, r0, #0x03
 	beq	.Lcksumdata_wordaligned
-	rsb	r7, r7, #0x04
-	cmp	r1, r7			/* Enough bytes left to make it? */
-	blt	.Lcksumdata_endgame
-	cmp	r7, #0x02
-	ldrb	r4, [r0], #0x01		/* Fetch 1st byte */
-	ldrbge	r5, [r0], #0x01		/* Fetch 2nd byte */
-	movlt	r5, #0x00
-	ldrbgt	r6, [r0], #0x01		/* Fetch 3rd byte */
-	movle	r6, #0x00
-	/* Combine the three bytes depending on endianness and alignment */
-#ifdef __ARMEB__
-	orreq	r2, r5, r4, lsl #8
-	orreq	r2, r2, r6, lsl #24
-	orrne	r2, r4, r5, lsl #8
-	orrne	r2, r2, r6, lsl #16
+	eors	r0, r0, r7		/* r0 is word aligned */
+	ldr	r2, [r0], #0x04
+#ifdef __thumb__
+	movs	r4, r7
+	lsls	r4, r4, #3
 #else
-	orreq	r2, r4, r5, lsl #8
-	orreq	r2, r2, r6, lsl #16
-	orrne	r2, r5, r4, lsl #8
-	orrne	r2, r2, r6, lsl #24
+	lsl	r4, r7, #3
 #endif
-	subs	r1, r1, r7		/* Update length */
-#ifdef __PROG26
-	ldreq	pc, [sp], #4		/* All done? */
+#if defined(__ARMEB__)
+	lsls	r2, r2, r4
+	lsrs	r2, r2, r4
 #else
-	RETc(eq)			/* All done? */
+	lsrs	r2, r2, r4
+	lsls	r2, r2, r4
+#endif
+	rsb	r7, r7, #0x04
+	subs	r1, r1, r7		/* Enough bytes left to make it? */
+	bgt	.Lcksumdata_wordaligned
+#ifdef __PROG26
+	ldreq	pc, [sp], #4		/* done */
+#else
+	RETc(eq)			/* done */
+#endif
+	adds	r7, r7, r1		/* undo sub */
+	adds	r7, r7, r1		/* r7 = offset + len */
+	rsb	r7, r7, #4
+	lsls	r7, r7, #3
+#if defined(__ARMEB__)
+	lsrs	r2, r2, r7
+	lsls	r2, r2, r7
+#else
+	lsls	r2, r2, r7
+	lsrs	r2, r2, r7
+#endif
+#ifdef __PROG26
+	ldr	pc, [sp], #4		/* done */
+#else
+	RET				/* done */
 #endif
 
 	/* Buffer is now word aligned */
@@ -225,7 +255,7 @@ ASENTRY_NP(.L_cksumdata)
 	ldrd	r6, [r0], #0x08
 	adcs	r2, r2, r4
 	adcs	r2, r2, r5
-	adc	r2, r2, #0x00
+	adcs	r2, r2, #0x00
 	subs	r1, r1, #0x40
 	ldrdge	r4, [r0], #0x08
 	bge	.Lcksumdata_bigloop
@@ -233,7 +263,7 @@ ASENTRY_NP(.L_cksumdata)
 	adds	r2, r2, r6		/* r6/r7 still need summing */
 .Lcksumdata_bigloop_end:
 	adcs	r2, r2, r7
-	adc	r2, r2, #0x00
+	adcs	r2, r2, #0x00
 
 #else	/* !__XSCALE__ */
 
@@ -261,7 +291,7 @@ ASENTRY_NP(.L_cksumdata)
 	adcs	r2, r2, r4
 	adcs	r2, r2, r5
 	adcs	r2, r2, r7
-	adc	r2, r2, #0x00
+	adcs	r2, r2, #0x00
 	subs	r1, r1, #0x40
 	bge	.Lcksumdata_bigloop
 .Lcksumdata_bigloop_end:
@@ -303,7 +333,7 @@ ASENTRY_NP(.L_cksumdata)
 	adcs	r2, r2, r5
 	adcs	r2, r2, r7
 #endif
-	adc	r2, r2, #0x00
+	adcs	r2, r2, #0x00
 	subs	r1, r1, #0x20
 #ifdef __PROG26
 	ldreq	pc, [sp], #4
@@ -315,8 +345,11 @@ ASENTRY_NP(.L_cksumdata)
 	/* There are less than 32 bytes left */
 	and	r3, r1, #0x18
 	rsb	r4, r3, #0x18
-	sub	r1, r1, r3
+	subs	r1, r1, r3
 	adds	r4, r4, r4, lsr #1	/* Side effect: Clear carry flag */
+#ifdef __thumb__
+	it	ne
+#endif
 	addne	pc, pc, r4
 
 /*
@@ -340,14 +373,14 @@ ASENTRY_NP(.L_cksumdata)
 	adcs	r2, r2, r5
 
 	/* Less than 8 bytes remaining... */
-	adc	r2, r2, #0x00
+	adcs	r2, r2, #0x00
 	subs	r1, r1, #0x04
 	blt	.Lcksumdata_lessthan4
 
 	ldr	r4, [r0], #0x04
-	sub	r1, r1, #0x04
+	subs	r1, r1, #0x04
 	adds	r2, r2, r4
-	adc	r2, r2, #0x00
+	adcs	r2, r2, #0x00
 
 	/* Deal with < 4 bytes remaining */
 .Lcksumdata_lessthan4:
@@ -360,27 +393,18 @@ ASENTRY_NP(.L_cksumdata)
 
 	/* Deal with 1 to 3 remaining bytes, possibly misaligned */
 .Lcksumdata_endgame:
-	ldrb	r3, [r0]		/* Fetch first byte */
-	cmp	r1, #0x02
-	ldrbge	r4, [r0, #0x01]		/* Fetch 2nd and 3rd as necessary */
-	movlt	r4, #0x00
-	ldrbgt	r5, [r0, #0x02]
-	movle	r5, #0x00
-	/* Combine the three bytes depending on endianness and alignment */
-	tst	r0, #0x01
+	ldr	r3, [r0]		/* Fetch last word */
+	rsb	r1, r1, #4		/* get discard amount */
+	lsl	r1, r1, #3		/* turn it into bits */
 #ifdef __ARMEB__
-	orreq	r3, r4, r3, lsl #8
-	orreq	r3, r3, r5, lsl #24
-	orrne	r3, r3, r4, lsl #8
-	orrne	r3, r3, r5, lsl #16
+	lsr	r3, r3, r1		/* discard least significant bits */
+	lsl	r3, r3, r1		/* shift back filling with zeros */
 #else
-	orreq	r3, r3, r4, lsl #8
-	orreq	r3, r3, r5, lsl #16
-	orrne	r3, r4, r3, lsl #8
-	orrne	r3, r3, r5, lsl #24
+	lsl	r3, r3, r1		/* discard least significant bits */
+	lsr	r3, r3, r1		/* shift back filling with zeros */
 #endif
 	adds	r2, r2, r3
-	adc	r2, r2, #0x00
+	adcs	r2, r2, #0x00
 #ifdef __PROG26
 	ldr	pc, [sp], #4
 #else
diff --git a/sys/arch/arm/at91/at91bus.c b/sys/arch/arm/at91/at91bus.c
index a6234e3e474a..7f1d902f0e4c 100644
--- a/sys/arch/arm/at91/at91bus.c
+++ b/sys/arch/arm/at91/at91bus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: at91bus.c,v 1.16 2012/11/12 18:00:36 skrll Exp $	*/
+/*	$NetBSD: at91bus.c,v 1.17 2013/08/18 15:58:19 matt Exp $	*/
 
 /*
  * Copyright (c) 2007 Embedtronics Oy
@@ -27,11 +27,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.16 2012/11/12 18:00:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.17 2013/08/18 15:58:19 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
+#include "locators.h"
 
 /* Define various stack sizes in pages */
 #define IRQ_STACK_SIZE	8
@@ -52,8 +53,10 @@ __KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.16 2012/11/12 18:00:36 skrll Exp $");
 #include <sys/reboot.h>
 #include <sys/termios.h>
 #include <sys/ksyms.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/termios.h>
 
-#include <machine/bootconfig.h>
 #include <uvm/uvm_extern.h>
 
 #include <dev/cons.h>
@@ -62,22 +65,16 @@ __KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.16 2012/11/12 18:00:36 skrll Exp $");
 #include <ddb/db_sym.h>
 #include <ddb/db_extern.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>
-#include <arm/cpufunc.h>
 
 #include <arm/at91/at91var.h>
 #include <arm/at91/at91busvar.h>
 #include <arm/at91/at91dbgureg.h>
 
-//#include <dev/cons.h>
-#include <sys/termios.h>
-
-#include "locators.h"
+#include <machine/bootconfig.h>
 
 /* console stuff: */
 #ifndef	CONSPEED
diff --git a/sys/arch/arm/ep93xx/ep93xx_intr.c b/sys/arch/arm/ep93xx/ep93xx_intr.c
index 7b5763d5ad8d..7fce055f57c2 100644
--- a/sys/arch/arm/ep93xx/ep93xx_intr.c
+++ b/sys/arch/arm/ep93xx/ep93xx_intr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ep93xx_intr.c,v 1.18 2012/11/12 18:00:36 skrll Exp $ */
+/* $NetBSD: ep93xx_intr.c,v 1.19 2013/08/18 15:58:19 matt Exp $ */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ep93xx_intr.c,v 1.18 2012/11/12 18:00:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ep93xx_intr.c,v 1.19 2013/08/18 15:58:19 matt Exp $");
 
 /*
  * Interrupt support for the Cirrus Logic EP93XX
@@ -45,9 +45,9 @@ __KERNEL_RCSID(0, "$NetBSD: ep93xx_intr.c,v 1.18 2012/11/12 18:00:36 skrll Exp $
 #include <sys/termios.h>
 
 #include <sys/bus.h>
-#include <machine/intr.h>
+#include <sys/intr.h>
 
-#include <arm/cpufunc.h>
+#include <arm/locore.h>
 
 #include <arm/ep93xx/ep93xxreg.h> 
 #include <arm/ep93xx/ep93xxvar.h> 
diff --git a/sys/arch/arm/gemini/gemini_pci.c b/sys/arch/arm/gemini/gemini_pci.c
index eb083208dbcc..3524d4b9d647 100644
--- a/sys/arch/arm/gemini/gemini_pci.c
+++ b/sys/arch/arm/gemini/gemini_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gemini_pci.c,v 1.14 2012/10/27 17:17:38 chs Exp $	*/
+/*	$NetBSD: gemini_pci.c,v 1.15 2013/08/18 15:58:19 matt Exp $	*/
 
 /* adapted from:
  *	NetBSD: i80312_pci.c,v 1.9 2005/12/11 12:16:51 christos Exp
@@ -44,20 +44,27 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_pci.c,v 1.14 2012/10/27 17:17:38 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_pci.c,v 1.15 2013/08/18 15:58:19 matt Exp $");
 
-#include <sys/cdefs.h>
+#include "opt_gemini.h"
+#include "opt_pci.h"
+#include "pci.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <sys/bus.h>
-#include <machine/intr.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcidevs.h>
+#include <dev/pci/pciconf.h>
+
+#include <arm/locore.h>
 
 #include <arm/pic/picvar.h>
 
@@ -65,16 +72,6 @@ __KERNEL_RCSID(0, "$NetBSD: gemini_pci.c,v 1.14 2012/10/27 17:17:38 chs Exp $");
 #include <arm/gemini/gemini_pcivar.h>
 #include <arm/gemini/gemini_obiovar.h>
 
-#include <dev/pci/pcivar.h>
-#include <dev/pci/pcidevs.h>
-#include <dev/pci/pciconf.h>
-
-#include <machine/pci_machdep.h>
-
-#include "opt_gemini.h"
-#include "opt_pci.h"
-#include "pci.h"
-
 void		gemini_pci_attach_hook(device_t, device_t,
 		    struct pcibus_attach_args *);
 int		gemini_pci_bus_maxdevs(void *, int);
diff --git a/sys/arch/arm/include/cpu.h b/sys/arch/arm/include/cpu.h
index fd0cf31c41cf..11f904b479ba 100644
--- a/sys/arch/arm/include/cpu.h
+++ b/sys/arch/arm/include/cpu.h
@@ -74,6 +74,10 @@
 #endif /* !_MODULE && _KERNEL_OPT */
 
 #ifndef _LOCORE
+#if defined(TPIDRPRW_IS_CURLWP) || defined(TPIDRPRW_IS_CURCPU)
+#include <arm/armreg.h>
+#endif
+
 /* 1 == use cpu_sleep(), 0 == don't */
 extern int cpu_do_powersave;
 extern int cpu_fpu_present;
diff --git a/sys/arch/arm/ixp12x0/ixp12x0_intr.c b/sys/arch/arm/ixp12x0/ixp12x0_intr.c
index 871b27d9be08..65a25b334123 100644
--- a/sys/arch/arm/ixp12x0/ixp12x0_intr.c
+++ b/sys/arch/arm/ixp12x0/ixp12x0_intr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp12x0_intr.c,v 1.24 2012/11/12 18:00:37 skrll Exp $ */
+/* $NetBSD: ixp12x0_intr.c,v 1.25 2013/08/18 15:58:19 matt Exp $ */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_intr.c,v 1.24 2012/11/12 18:00:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_intr.c,v 1.25 2013/08/18 15:58:19 matt Exp $");
 
 /*
  * Interrupt support for the Intel ixp12x0
@@ -41,11 +41,10 @@ __KERNEL_RCSID(0, "$NetBSD: ixp12x0_intr.c,v 1.24 2012/11/12 18:00:37 skrll Exp
 #include <sys/malloc.h>
 #include <sys/simplelock.h>
 #include <sys/termios.h>
-
 #include <sys/bus.h>
-#include <machine/intr.h>
+#include <sys/intr.h>
 
-#include <arm/cpufunc.h>
+#include <arm/locore.h>
 
 #include <arm/ixp12x0/ixp12x0reg.h> 
 #include <arm/ixp12x0/ixp12x0var.h> 
diff --git a/sys/arch/arm/ixp12x0/ixp12x0_pci.c b/sys/arch/arm/ixp12x0/ixp12x0_pci.c
index 73a11947977b..e16920f1aa64 100644
--- a/sys/arch/arm/ixp12x0/ixp12x0_pci.c
+++ b/sys/arch/arm/ixp12x0/ixp12x0_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp12x0_pci.c,v 1.13 2012/10/27 17:17:39 chs Exp $ */
+/* $NetBSD: ixp12x0_pci.c,v 1.14 2013/08/18 15:58:19 matt Exp $ */
 /*
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,12 +29,15 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_pci.c,v 1.13 2012/10/27 17:17:39 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_pci.c,v 1.14 2013/08/18 15:58:19 matt Exp $");
 
 /*
  * PCI configuration support for IXP12x0 Network Processor chip.
  */
 
+#include "opt_pci.h"
+#include "pci.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
@@ -50,8 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp12x0_pci.c,v 1.13 2012/10/27 17:17:39 chs Exp $")
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pciconf.h>
 
-#include "opt_pci.h"
-#include "pci.h"
+#include <arm/locore.h>
 
 void ixp12x0_pci_attach_hook(device_t, device_t,
 	struct pcibus_attach_args *);
diff --git a/sys/arch/arm/omap/omap_intr.h b/sys/arch/arm/omap/omap_intr.h
index 8f4da78b2b55..32782483c56d 100644
--- a/sys/arch/arm/omap/omap_intr.h
+++ b/sys/arch/arm/omap/omap_intr.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: omap_intr.h,v 1.8 2012/09/01 14:48:29 matt Exp $ */
+/*	$NetBSD: omap_intr.h,v 1.9 2013/08/18 15:58:19 matt Exp $ */
 
 /*
  * Redistribution and use in source and binary forms, with or without
@@ -40,6 +40,8 @@
 
 #ifndef _LOCORE
 
+#include <sys/device_if.h>
+
 #include <arm/cpu.h>
 #include <arm/armreg.h>
 #include <arm/cpufunc.h>
diff --git a/sys/arch/arm/s3c2xx0/s3c2800_pci.c b/sys/arch/arm/s3c2xx0/s3c2800_pci.c
index 422e3d7bba7e..0cb8d1d93d7b 100644
--- a/sys/arch/arm/s3c2xx0/s3c2800_pci.c
+++ b/sys/arch/arm/s3c2xx0/s3c2800_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: s3c2800_pci.c,v 1.19 2012/10/27 17:17:40 chs Exp $	*/
+/*	$NetBSD: s3c2800_pci.c,v 1.20 2013/08/18 15:58:19 matt Exp $	*/
 
 /*
  * Copyright (c) 2002 Fujitsu Component Limited
@@ -100,7 +100,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2800_pci.c,v 1.19 2012/10/27 17:17:40 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2800_pci.c,v 1.20 2013/08/18 15:58:19 matt Exp $");
+
+#include "opt_pci.h"
+#include "pci.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -113,14 +116,14 @@ __KERNEL_RCSID(0, "$NetBSD: s3c2800_pci.c,v 1.19 2012/10/27 17:17:40 chs Exp $")
 
 #include <sys/bus.h>
 
-#include <arm/s3c2xx0/s3c2800reg.h>
-#include <arm/s3c2xx0/s3c2800var.h>
-
 #include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
 #include <dev/pci/pciconf.h>
 
-#include "opt_pci.h"
-#include "pci.h"
+#include <arm/locore.h>
+
+#include <arm/s3c2xx0/s3c2800reg.h>
+#include <arm/s3c2xx0/s3c2800var.h>
 
 /*
  * pci tag encoding.
diff --git a/sys/arch/arm/xscale/becc_pci.c b/sys/arch/arm/xscale/becc_pci.c
index 966ec55748c2..b6fdc72834d1 100644
--- a/sys/arch/arm/xscale/becc_pci.c
+++ b/sys/arch/arm/xscale/becc_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: becc_pci.c,v 1.13 2012/10/14 14:20:57 msaitoh Exp $	*/
+/*	$NetBSD: becc_pci.c,v 1.14 2013/08/18 15:58:20 matt Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -41,27 +41,29 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: becc_pci.c,v 1.13 2012/10/14 14:20:57 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: becc_pci.c,v 1.14 2013/08/18 15:58:20 matt Exp $");
+
+#include "opt_pci.h"
+#include "pci.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
+#include <sys/bus.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <sys/bus.h>
+#include <dev/pci/ppbreg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pciconf.h>
+
+#include <arm/locore.h>
 
 #include <arm/xscale/beccreg.h>
 #include <arm/xscale/beccvar.h>
 
-#include <dev/pci/ppbreg.h>
-#include <dev/pci/pciconf.h>
-
-#include "opt_pci.h"
-#include "pci.h"
-
 void		becc_pci_attach_hook(device_t, device_t,
 		    struct pcibus_attach_args *);
 int		becc_pci_bus_maxdevs(void *, int);
diff --git a/sys/arch/arm/xscale/i80312_pci.c b/sys/arch/arm/xscale/i80312_pci.c
index 171031ff2ac5..da99294220b6 100644
--- a/sys/arch/arm/xscale/i80312_pci.c
+++ b/sys/arch/arm/xscale/i80312_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: i80312_pci.c,v 1.13 2012/10/14 14:20:57 msaitoh Exp $	*/
+/*	$NetBSD: i80312_pci.c,v 1.14 2013/08/18 15:58:20 matt Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,27 +40,29 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i80312_pci.c,v 1.13 2012/10/14 14:20:57 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i80312_pci.c,v 1.14 2013/08/18 15:58:20 matt Exp $");
+
+#include "opt_pci.h"
+#include "pci.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
+#include <sys/bus.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <sys/bus.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pciconf.h>
+#include <dev/pci/ppbreg.h>
+
+#include <arm/locore.h>
 
 #include <arm/xscale/i80312reg.h>
 #include <arm/xscale/i80312var.h>
 
-#include <dev/pci/ppbreg.h>
-#include <dev/pci/pciconf.h>
-
-#include "opt_pci.h"
-#include "pci.h"
-
 void		i80312_pci_attach_hook(device_t, device_t,
 		    struct pcibus_attach_args *);
 int		i80312_pci_bus_maxdevs(void *, int);
diff --git a/sys/arch/arm/xscale/i80321_pci.c b/sys/arch/arm/xscale/i80321_pci.c
index 60e7cf832e5f..8213dd5705d2 100644
--- a/sys/arch/arm/xscale/i80321_pci.c
+++ b/sys/arch/arm/xscale/i80321_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: i80321_pci.c,v 1.14 2012/10/14 14:20:57 msaitoh Exp $	*/
+/*	$NetBSD: i80321_pci.c,v 1.15 2013/08/18 15:58:20 matt Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,28 +40,30 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i80321_pci.c,v 1.14 2012/10/14 14:20:57 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i80321_pci.c,v 1.15 2013/08/18 15:58:20 matt Exp $");
+
+#include "opt_pci.h"
+#include "opt_i80321.h"
+#include "pci.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
+#include <sys/bus.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <sys/bus.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pciconf.h>
+#include <dev/pci/ppbreg.h>
+
+#include <arm/locore.h>
 
 #include <arm/xscale/i80321reg.h>
 #include <arm/xscale/i80321var.h>
 
-#include <dev/pci/ppbreg.h>
-#include <dev/pci/pciconf.h>
-
-#include "opt_pci.h"
-#include "opt_i80321.h"
-#include "pci.h"
-
 void		i80321_pci_attach_hook(device_t, device_t,
 		    struct pcibus_attach_args *);
 int		i80321_pci_bus_maxdevs(void *, int);
diff --git a/sys/arch/evbarm/adi_brh/brh_machdep.c b/sys/arch/evbarm/adi_brh/brh_machdep.c
index 4105d713f822..05909832078b 100644
--- a/sys/arch/evbarm/adi_brh/brh_machdep.c
+++ b/sys/arch/evbarm/adi_brh/brh_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: brh_machdep.c,v 1.41 2012/09/22 00:33:38 matt Exp $	*/
+/*	$NetBSD: brh_machdep.c,v 1.42 2013/08/18 15:58:20 matt Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.41 2012/09/22 00:33:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.42 2013/08/18 15:58:20 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
@@ -88,6 +88,8 @@ __KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.41 2012/09/22 00:33:38 matt Exp $"
 #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>
 
@@ -98,9 +100,7 @@ __KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.41 2012/09/22 00:33:38 matt Exp $"
 #include <ddb/db_extern.h>
 
 #include <machine/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>
diff --git a/sys/arch/evbarm/armadillo/armadillo9_machdep.c b/sys/arch/evbarm/armadillo/armadillo9_machdep.c
index 02b801388871..3d891e795513 100644
--- a/sys/arch/evbarm/armadillo/armadillo9_machdep.c
+++ b/sys/arch/evbarm/armadillo/armadillo9_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: armadillo9_machdep.c,v 1.26 2012/11/12 18:00:38 skrll Exp $	*/
+/*	$NetBSD: armadillo9_machdep.c,v 1.27 2013/08/18 15:58:20 matt Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -110,7 +110,7 @@
 */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.26 2012/11/12 18:00:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.27 2013/08/18 15:58:20 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -126,6 +126,8 @@ __KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.26 2012/11/12 18:00:38 skrl
 #include <sys/reboot.h>
 #include <sys/termios.h>
 #include <sys/ksyms.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
 
 #include <net/if.h>
 #include <net/if_ether.h>
@@ -141,9 +143,7 @@ __KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.26 2012/11/12 18:00:38 skrl
 #define	DRAM_BLOCKS	4
 #include <machine/bootconfig.h>
 #include <machine/autoconf.h>
-#include <sys/bus.h>
-#include <machine/cpu.h>
-#include <machine/frame.h>
+#include <arm/locore.h>
 #include <arm/undefined.h>
 
 /* Define various stack sizes in pages */
diff --git a/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c b/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
index 4586c41c32d5..7edf1c0dbc87 100644
--- a/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
+++ b/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: g42xxeb_machdep.c,v 1.27 2012/09/22 00:33:38 matt Exp $ */
+/*	$NetBSD: g42xxeb_machdep.c,v 1.28 2013/08/18 15:58:20 matt Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004, 2005  Genetec Corporation.  
@@ -124,6 +124,8 @@
 #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>
 
@@ -139,9 +141,7 @@
 #endif
 
 #include <machine/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>
diff --git a/sys/arch/evbarm/gemini/gemini_machdep.c b/sys/arch/evbarm/gemini/gemini_machdep.c
index 7ed88e46d5f2..0344396b3fa7 100644
--- a/sys/arch/evbarm/gemini/gemini_machdep.c
+++ b/sys/arch/evbarm/gemini/gemini_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gemini_machdep.c,v 1.21 2012/09/22 00:33:38 matt Exp $	*/
+/*	$NetBSD: gemini_machdep.c,v 1.22 2013/08/18 15:58:20 matt Exp $	*/
 
 /* adapted from:
  *	NetBSD: sdp24xx_machdep.c,v 1.4 2008/08/27 11:03:10 matt Exp
@@ -129,7 +129,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.21 2012/09/22 00:33:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.22 2013/08/18 15:58:20 matt Exp $");
 
 #include "opt_machdep.h"
 #include "opt_ddb.h"
@@ -151,10 +151,12 @@ __KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.21 2012/09/22 00:33:38 matt Exp
 #include <sys/reboot.h>
 #include <sys/termios.h>
 #include <sys/ksyms.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/conf.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <sys/conf.h>
 #include <dev/cons.h>
 #include <dev/md.h>
 
@@ -165,15 +167,13 @@ __KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.21 2012/09/22 00:33:38 matt Exp
 #include <sys/kgdb.h>
 #endif
 
-#include <machine/bootconfig.h>
-#include <sys/bus.h>
-#include <machine/cpu.h>
-#include <machine/frame.h>
-#include <arm/armreg.h>
+#include <arm/locore.h>
 #include <arm/undefined.h>
 
 #include <arm/arm32/machdep.h>
 
+#include <machine/bootconfig.h>
+
 #include <arm/gemini/gemini_reg.h>
 #include <arm/gemini/gemini_var.h>
 #include <arm/gemini/gemini_wdtvar.h>
diff --git a/sys/arch/evbarm/gumstix/gumstix_machdep.c b/sys/arch/evbarm/gumstix/gumstix_machdep.c
index d6145b328fca..a6dd8b58ba4f 100644
--- a/sys/arch/evbarm/gumstix/gumstix_machdep.c
+++ b/sys/arch/evbarm/gumstix/gumstix_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gumstix_machdep.c,v 1.46 2012/12/24 06:53:26 kiyohara Exp $ */
+/*	$NetBSD: gumstix_machdep.c,v 1.47 2013/08/18 15:58:20 matt Exp $ */
 /*
  * Copyright (C) 2005, 2006, 2007  WIDE Project and SOUM Corporation.
  * All rights reserved.
@@ -162,13 +162,14 @@
 #include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/termios.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
 
 #include <machine/autoconf.h>
 #include <machine/bootconfig.h>
-#include <sys/bus.h>
-#include <machine/cpu.h>
 #include <machine/db_machdep.h>
-#include <machine/frame.h>
+#include <arm/locore.h>
+#include <arm/undefined.h>
 
 #include <arm/arm32/machdep.h>
 #ifdef OVERO
@@ -178,7 +179,6 @@
 #include <arm/omap/omap_var.h>
 #include <arm/omap/omap_com.h>
 #endif
-#include <arm/undefined.h>
 #include <arm/xscale/pxa2x0reg.h>
 #include <arm/xscale/pxa2x0var.h>
 #include <arm/xscale/pxa2x0_gpio.h>
diff --git a/sys/arch/evbarm/gumstix/gumstix_start.S b/sys/arch/evbarm/gumstix/gumstix_start.S
index 2433548920e4..31e90bf48474 100644
--- a/sys/arch/evbarm/gumstix/gumstix_start.S
+++ b/sys/arch/evbarm/gumstix/gumstix_start.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: gumstix_start.S,v 1.11 2012/12/29 14:22:55 kiyohara Exp $ */
+/*	$NetBSD: gumstix_start.S,v 1.12 2013/08/18 15:58:20 matt Exp $ */
 /*
  * Copyright (C) 2005, 2006 WIDE Project and SOUM Corporation.
  * All rights reserved.
@@ -66,7 +66,7 @@
 #include <arm/armreg.h>
 #include "assym.h"
 
-RCSID("$NetBSD: gumstix_start.S,v 1.11 2012/12/29 14:22:55 kiyohara Exp $")
+RCSID("$NetBSD: gumstix_start.S,v 1.12 2013/08/18 15:58:20 matt Exp $")
 
 /*
  * CPWAIT -- Canonical method to wait for CP15 update.
@@ -266,7 +266,7 @@ mmu_init_table:
 #define SDRAM_START	0x80000000
 
 	/* Map VA to PA, write-back cacheable (first 64M only) */
-	MMU_INIT(KERNEL_BASE, SDRAM_START,
+	MMU_INIT(KERNEL_BASE & 0xffffffff, SDRAM_START,
 	    64, L1_S_PROTO | L1_S_B | L1_S_C | L1_S_APv7_KRW)
 #endif
 
diff --git a/sys/arch/evbarm/hdl_g/hdlg_machdep.c b/sys/arch/evbarm/hdl_g/hdlg_machdep.c
index 745d3704ba6e..86bdd541c961 100644
--- a/sys/arch/evbarm/hdl_g/hdlg_machdep.c
+++ b/sys/arch/evbarm/hdl_g/hdlg_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hdlg_machdep.c,v 1.20 2012/09/22 00:33:39 matt Exp $	*/
+/*	$NetBSD: hdlg_machdep.c,v 1.21 2013/08/18 15:58:20 matt Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.20 2012/09/22 00:33:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.21 2013/08/18 15:58:20 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -89,6 +89,8 @@ __KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.20 2012/09/22 00:33:39 matt Exp $
 #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>
 
@@ -99,9 +101,7 @@ __KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.20 2012/09/22 00:33:39 matt Exp $
 #include <ddb/db_extern.h>
 
 #include <machine/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>
diff --git a/sys/arch/evbarm/ifpga/ifpgavar.h b/sys/arch/evbarm/ifpga/ifpgavar.h
index d13b278ba0e5..bdf8fd9f824e 100644
--- a/sys/arch/evbarm/ifpga/ifpgavar.h
+++ b/sys/arch/evbarm/ifpga/ifpgavar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ifpgavar.h,v 1.7 2013/02/19 10:57:10 skrll Exp $ */
+/*	$NetBSD: ifpgavar.h,v 1.8 2013/08/18 15:58:20 matt Exp $ */
 
 /*
  * Copyright (c) 2001 ARM Ltd
@@ -33,6 +33,7 @@
 #define _IFPGAVAR_H_
 
 #include <sys/bus.h>
+#include <sys/evcnt.h>
 
 /* We statically map the UARTS at boot so that we can access the console
    before we've probed for the IFPGA. */
diff --git a/sys/arch/evbarm/imx31/imx31lk_machdep.c b/sys/arch/evbarm/imx31/imx31lk_machdep.c
index faad7d9c7e5d..427723f4b628 100644
--- a/sys/arch/evbarm/imx31/imx31lk_machdep.c
+++ b/sys/arch/evbarm/imx31/imx31lk_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: imx31lk_machdep.c,v 1.16 2012/09/22 00:33:39 matt Exp $ */
+/* $NetBSD: imx31lk_machdep.c,v 1.17 2013/08/18 15:58:20 matt Exp $ */
 
 /*
  * Startup routines for the ZOOM iMX31 LITEKIT.
@@ -110,7 +110,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.16 2012/09/22 00:33:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.17 2013/08/18 15:58:20 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -129,6 +129,8 @@ __KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.16 2012/09/22 00:33:39 matt Ex
 #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>
 
@@ -144,9 +146,7 @@ __KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.16 2012/09/22 00:33:39 matt Ex
 #endif
 
 #include <machine/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/pte.h>
diff --git a/sys/arch/evbarm/integrator/integrator_machdep.c b/sys/arch/evbarm/integrator/integrator_machdep.c
index 3fd379c7994c..e7ad5842f4f9 100644
--- a/sys/arch/evbarm/integrator/integrator_machdep.c
+++ b/sys/arch/evbarm/integrator/integrator_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: integrator_machdep.c,v 1.73 2013/02/19 10:57:10 skrll Exp $	*/
+/*	$NetBSD: integrator_machdep.c,v 1.74 2013/08/18 15:58:20 matt Exp $	*/
 
 /*
  * Copyright (c) 2001,2002 ARM Ltd
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: integrator_machdep.c,v 1.73 2013/02/19 10:57:10 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: integrator_machdep.c,v 1.74 2013/08/18 15:58:20 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
@@ -83,6 +83,9 @@ __KERNEL_RCSID(0, "$NetBSD: integrator_machdep.c,v 1.73 2013/02/19 10:57:10 skrl
 #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>
 
@@ -93,10 +96,7 @@ __KERNEL_RCSID(0, "$NetBSD: integrator_machdep.c,v 1.73 2013/02/19 10:57:10 skrl
 #include <ddb/db_extern.h>
 
 #include <machine/bootconfig.h>
-#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 <arm/arm32/machdep.h>
diff --git a/sys/arch/evbarm/iq80310/iq80310_machdep.c b/sys/arch/evbarm/iq80310/iq80310_machdep.c
index f364cb565577..553f45ebd1ce 100644
--- a/sys/arch/evbarm/iq80310/iq80310_machdep.c
+++ b/sys/arch/evbarm/iq80310/iq80310_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iq80310_machdep.c,v 1.83 2012/09/22 00:33:39 matt Exp $	*/
+/*	$NetBSD: iq80310_machdep.c,v 1.84 2013/08/18 15:58:20 matt Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.83 2012/09/22 00:33:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.84 2013/08/18 15:58:20 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
@@ -88,6 +88,8 @@ __KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.83 2012/09/22 00:33:39 matt Ex
 #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>
 
@@ -98,9 +100,7 @@ __KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.83 2012/09/22 00:33:39 matt Ex
 #include <ddb/db_extern.h>
 
 #include <machine/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>
diff --git a/sys/arch/evbarm/iq80321/iq80321_machdep.c b/sys/arch/evbarm/iq80321/iq80321_machdep.c
index 99602225ef8d..6f7674e49579 100644
--- a/sys/arch/evbarm/iq80321/iq80321_machdep.c
+++ b/sys/arch/evbarm/iq80321/iq80321_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iq80321_machdep.c,v 1.53 2012/09/22 00:33:39 matt Exp $	*/
+/*	$NetBSD: iq80321_machdep.c,v 1.54 2013/08/18 15:58:20 matt Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.53 2012/09/22 00:33:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.54 2013/08/18 15:58:20 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -89,19 +89,22 @@ __KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.53 2012/09/22 00:33:39 matt Ex
 #include <sys/reboot.h>
 #include <sys/termios.h>
 #include <sys/ksyms.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
 
 #include <uvm/uvm_extern.h>
 
 #include <dev/cons.h>
 
+#include <dev/pci/ppbreg.h>
+
 #include <machine/db_machdep.h>
 #include <ddb/db_sym.h>
 #include <ddb/db_extern.h>
 
 #include <machine/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>
@@ -109,8 +112,6 @@ __KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.53 2012/09/22 00:33:39 matt Ex
 #include <arm/xscale/i80321reg.h>
 #include <arm/xscale/i80321var.h>
 
-#include <dev/pci/ppbreg.h>
-
 #include <evbarm/iq80321/iq80321reg.h>
 #include <evbarm/iq80321/iq80321var.h>
 #include <evbarm/iq80321/obiovar.h>
diff --git a/sys/arch/evbarm/iq80321/iq80321_pci.c b/sys/arch/evbarm/iq80321/iq80321_pci.c
index 2300282bf09e..b7ef68d24fa9 100644
--- a/sys/arch/evbarm/iq80321/iq80321_pci.c
+++ b/sys/arch/evbarm/iq80321/iq80321_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iq80321_pci.c,v 1.7 2011/07/01 20:41:16 dyoung Exp $	*/
+/*	$NetBSD: iq80321_pci.c,v 1.8 2013/08/18 15:58:20 matt Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,14 +40,19 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80321_pci.c,v 1.7 2011/07/01 20:41:16 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80321_pci.c,v 1.8 2013/08/18 15:58:20 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
+#include <sys/bus.h>
+
+#include <dev/pci/pcidevs.h>
+#include <dev/pci/ppbreg.h>
+
+#include <arm/locore.h>
 
 #include <machine/autoconf.h>
-#include <sys/bus.h>
 
 #include <evbarm/iq80321/iq80321reg.h>
 #include <evbarm/iq80321/iq80321var.h>
@@ -55,9 +60,6 @@ __KERNEL_RCSID(0, "$NetBSD: iq80321_pci.c,v 1.7 2011/07/01 20:41:16 dyoung Exp $
 #include <arm/xscale/i80321reg.h>
 #include <arm/xscale/i80321var.h>
 
-#include <dev/pci/pcidevs.h>
-#include <dev/pci/ppbreg.h>
-
 int	iq80321_pci_intr_map(const struct pci_attach_args *,
 	    pci_intr_handle_t *);
 const char *iq80321_pci_intr_string(void *, pci_intr_handle_t);
diff --git a/sys/arch/evbarm/ixdp425/ixdp425_machdep.c b/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
index 40bac6912e7d..0e495c254b5f 100644
--- a/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
+++ b/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ixdp425_machdep.c,v 1.33 2012/11/12 18:00:39 skrll Exp $ */
+/*	$NetBSD: ixdp425_machdep.c,v 1.34 2013/08/18 15:58:20 matt Exp $ */
 /*
  * Copyright (c) 2003
  *	Ichiro FUKUHARA <ichiro@ichiro.org>.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.33 2012/11/12 18:00:39 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.34 2013/08/18 15:58:20 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -80,6 +80,8 @@ __KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.33 2012/11/12 18:00:39 skrll E
 #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>
 
@@ -90,9 +92,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.33 2012/11/12 18:00:39 skrll E
 #include <ddb/db_extern.h>
 
 #include <machine/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>
diff --git a/sys/arch/evbarm/ixm1200/ixm1200_machdep.c b/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
index dad47b1ae6fb..31c569056dc1 100644
--- a/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
+++ b/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ixm1200_machdep.c,v 1.53 2012/11/12 18:00:39 skrll Exp $ */
+/*	$NetBSD: ixm1200_machdep.c,v 1.54 2013/08/18 15:58:20 matt Exp $ */
 
 /*
  * Copyright (c) 2002, 2003
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.53 2012/11/12 18:00:39 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.54 2013/08/18 15:58:20 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_modular.h"
@@ -77,6 +77,8 @@ __KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.53 2012/11/12 18:00:39 skrll E
 #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>
 
@@ -96,9 +98,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.53 2012/11/12 18:00:39 skrll E
 #endif
 
 #include <machine/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>
diff --git a/sys/arch/evbarm/lubbock/lubbock_machdep.c b/sys/arch/evbarm/lubbock/lubbock_machdep.c
index 34a1135a8a97..ec7b6694c868 100644
--- a/sys/arch/evbarm/lubbock/lubbock_machdep.c
+++ b/sys/arch/evbarm/lubbock/lubbock_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lubbock_machdep.c,v 1.31 2012/09/22 00:33:40 matt Exp $ */
+/*	$NetBSD: lubbock_machdep.c,v 1.32 2013/08/18 15:58:20 matt Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2005  Genetec Corporation.  All rights reserved.
@@ -112,7 +112,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.31 2012/09/22 00:33:40 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.32 2013/08/18 15:58:20 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -131,10 +131,12 @@ __KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.31 2012/09/22 00:33:40 matt Ex
 #include <sys/reboot.h>
 #include <sys/termios.h>
 #include <sys/ksyms.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/conf.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <sys/conf.h>
 #include <dev/cons.h>
 #include <dev/md.h>
 #include <dev/ic/smc91cxxreg.h>
@@ -147,9 +149,7 @@ __KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.31 2012/09/22 00:33:40 matt Ex
 #endif
 
 #include <machine/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>
diff --git a/sys/arch/evbarm/mpcsa/mpcsa_machdep.c b/sys/arch/evbarm/mpcsa/mpcsa_machdep.c
index 76bd09482bc9..6bade22a80c1 100644
--- a/sys/arch/evbarm/mpcsa/mpcsa_machdep.c
+++ b/sys/arch/evbarm/mpcsa/mpcsa_machdep.c
@@ -1,5 +1,5 @@
-/*	$Id: mpcsa_machdep.c,v 1.8 2012/10/27 17:17:48 chs Exp $	*/
-/*	$NetBSD: mpcsa_machdep.c,v 1.8 2012/10/27 17:17:48 chs Exp $	*/
+/*	$Id: mpcsa_machdep.c,v 1.9 2013/08/18 15:58:20 matt Exp $	*/
+/*	$NetBSD: mpcsa_machdep.c,v 1.9 2013/08/18 15:58:20 matt Exp $	*/
 
 /*
  * Copyright (c) 2007 Embedtronics Oy
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpcsa_machdep.c,v 1.8 2012/10/27 17:17:48 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpcsa_machdep.c,v 1.9 2013/08/18 15:58:20 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -93,20 +93,21 @@ __KERNEL_RCSID(0, "$NetBSD: mpcsa_machdep.c,v 1.8 2012/10/27 17:17:48 chs Exp $"
 #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/ic/comreg.h>
+#include <dev/ic/comvar.h>
+
 #include <machine/db_machdep.h>
 #include <ddb/db_sym.h>
 #include <ddb/db_extern.h>
 
-#define	DRAM_BLOCKS	1
-#include <machine/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>
@@ -114,9 +115,8 @@ __KERNEL_RCSID(0, "$NetBSD: mpcsa_machdep.c,v 1.8 2012/10/27 17:17:48 chs Exp $"
 #include <arm/at91/at91reg.h>
 #include <arm/at91/at91var.h>
 
-#include <dev/ic/comreg.h>
-#include <dev/ic/comvar.h>
-
+#define	DRAM_BLOCKS	1
+#include <machine/bootconfig.h>
 #include <machine/autoconf.h>
 
 #include "seeprom.h"
diff --git a/sys/arch/evbarm/netwalker/netwalker_machdep.c b/sys/arch/evbarm/netwalker/netwalker_machdep.c
index 55964c238275..8125537e9556 100644
--- a/sys/arch/evbarm/netwalker/netwalker_machdep.c
+++ b/sys/arch/evbarm/netwalker/netwalker_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netwalker_machdep.c,v 1.10 2012/09/22 00:33:40 matt Exp $	*/
+/*	$NetBSD: netwalker_machdep.c,v 1.11 2013/08/18 15:58:21 matt Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003, 2005, 2010  Genetec Corporation. 
@@ -102,7 +102,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.10 2012/09/22 00:33:40 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.11 2013/08/18 15:58:21 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -124,10 +124,12 @@ __KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.10 2012/09/22 00:33:40 matt
 #include <sys/reboot.h>
 #include <sys/termios.h>
 #include <sys/ksyms.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/conf.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <sys/conf.h>
 #include <dev/cons.h>
 #include <dev/md.h>
 
@@ -139,9 +141,7 @@ __KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.10 2012/09/22 00:33:40 matt
 #endif
 
 #include <machine/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/pte.h>
diff --git a/sys/arch/evbarm/osk5912/osk5912_machdep.c b/sys/arch/evbarm/osk5912/osk5912_machdep.c
index 9f4e8025f5e9..e52657baabe3 100644
--- a/sys/arch/evbarm/osk5912/osk5912_machdep.c
+++ b/sys/arch/evbarm/osk5912/osk5912_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: osk5912_machdep.c,v 1.14 2012/09/22 00:33:40 matt Exp $ */
+/*	$NetBSD: osk5912_machdep.c,v 1.15 2013/08/18 15:58:21 matt Exp $ */
 
 /*
  * Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -99,7 +99,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osk5912_machdep.c,v 1.14 2012/09/22 00:33:40 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osk5912_machdep.c,v 1.15 2013/08/18 15:58:21 matt Exp $");
 
 #include "opt_machdep.h"
 #include "opt_ddb.h"
@@ -117,10 +117,12 @@ __KERNEL_RCSID(0, "$NetBSD: osk5912_machdep.c,v 1.14 2012/09/22 00:33:40 matt Ex
 #include <sys/reboot.h>
 #include <sys/termios.h>
 #include <sys/ksyms.h>
+#include <sys/bus.h>
+#include <sys/conf.h>
+#include <sys/cpu.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <sys/conf.h>
 #include <dev/cons.h>
 #include <dev/md.h>
 
@@ -132,9 +134,7 @@ __KERNEL_RCSID(0, "$NetBSD: osk5912_machdep.c,v 1.14 2012/09/22 00:33:40 matt Ex
 #endif
 
 #include <machine/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>
diff --git a/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c b/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
index 8349f608d896..12470ea6951b 100644
--- a/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
+++ b/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: smdk2410_machdep.c,v 1.32 2012/09/22 00:33:40 matt Exp $ */
+/*	$NetBSD: smdk2410_machdep.c,v 1.33 2013/08/18 15:58:21 matt Exp $ */
 
 /*
  * Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -105,7 +105,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.32 2012/09/22 00:33:40 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.33 2013/08/18 15:58:21 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -122,6 +122,9 @@ __KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.32 2012/09/22 00:33:40 matt E
 #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>
 
@@ -136,10 +139,7 @@ __KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.32 2012/09/22 00:33:40 matt E
 #endif
 
 #include <machine/bootconfig.h>
-#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 <arm/arm32/machdep.h>
diff --git a/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c b/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
index ed0533fa5668..ea408f6c9e42 100644
--- a/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
+++ b/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: smdk2800_machdep.c,v 1.40 2012/09/22 00:33:40 matt Exp $ */
+/*	$NetBSD: smdk2800_machdep.c,v 1.41 2013/08/18 15:58:21 matt Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2005 Fujitsu Component Limited
@@ -106,7 +106,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.40 2012/09/22 00:33:40 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.41 2013/08/18 15:58:21 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -124,6 +124,9 @@ __KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.40 2012/09/22 00:33:40 matt E
 #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>
 
@@ -138,10 +141,7 @@ __KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.40 2012/09/22 00:33:40 matt E
 #endif
 
 #include <machine/bootconfig.h>
-#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 <arm/arm32/machdep.h>
diff --git a/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c b/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
index 4e7ec4fb35ea..4f7279513a41 100644
--- a/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
+++ b/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdp24xx_machdep.c,v 1.15 2012/09/22 00:33:40 matt Exp $ */
+/*	$NetBSD: sdp24xx_machdep.c,v 1.16 2013/08/18 15:58:21 matt Exp $ */
 
 /*
  * Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdp24xx_machdep.c,v 1.15 2012/09/22 00:33:40 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdp24xx_machdep.c,v 1.16 2013/08/18 15:58:21 matt Exp $");
 
 #include "opt_machdep.h"
 #include "opt_ddb.h"
@@ -145,6 +145,8 @@ __KERNEL_RCSID(0, "$NetBSD: sdp24xx_machdep.c,v 1.15 2012/09/22 00:33:40 matt Ex
 #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>
 
@@ -160,10 +162,7 @@ __KERNEL_RCSID(0, "$NetBSD: sdp24xx_machdep.c,v 1.15 2012/09/22 00:33:40 matt Ex
 #endif
 
 #include <machine/bootconfig.h>
-#include <sys/bus.h>
-#include <machine/cpu.h>
-#include <machine/frame.h>
-#include <arm/armreg.h>
+#include <arm/locore.h>
 #include <arm/undefined.h>
 
 #include <arm/arm32/machdep.h>
diff --git a/sys/arch/evbarm/tsarm/tsarm_machdep.c b/sys/arch/evbarm/tsarm/tsarm_machdep.c
index a776a79ae4c3..718c843fc022 100644
--- a/sys/arch/evbarm/tsarm/tsarm_machdep.c
+++ b/sys/arch/evbarm/tsarm/tsarm_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tsarm_machdep.c,v 1.20 2012/11/12 18:00:40 skrll Exp $ */
+/*	$NetBSD: tsarm_machdep.c,v 1.21 2013/08/18 15:58:21 matt Exp $ */
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsarm_machdep.c,v 1.20 2012/11/12 18:00:40 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsarm_machdep.c,v 1.21 2013/08/18 15:58:21 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -89,6 +89,8 @@ __KERNEL_RCSID(0, "$NetBSD: tsarm_machdep.c,v 1.20 2012/11/12 18:00:40 skrll Exp
 #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>
 
@@ -99,9 +101,7 @@ __KERNEL_RCSID(0, "$NetBSD: tsarm_machdep.c,v 1.20 2012/11/12 18:00:40 skrll Exp
 #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>
 
 /* Define various stack sizes in pages */
diff --git a/sys/arch/evbarm/viper/viper_machdep.c b/sys/arch/evbarm/viper/viper_machdep.c
index 1a6f96162c0c..3ed8b2a9d59f 100644
--- a/sys/arch/evbarm/viper/viper_machdep.c
+++ b/sys/arch/evbarm/viper/viper_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: viper_machdep.c,v 1.22 2012/09/22 00:33:41 matt Exp $ */
+/*	$NetBSD: viper_machdep.c,v 1.23 2013/08/18 15:58:21 matt Exp $ */
 
 /*
  * Startup routines for the Arcom Viper.  Below you can trace the
@@ -112,7 +112,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.22 2012/09/22 00:33:41 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.23 2013/08/18 15:58:21 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -131,6 +131,8 @@ __KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.22 2012/09/22 00:33:41 matt Exp
 #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>
 
@@ -147,9 +149,7 @@ __KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.22 2012/09/22 00:33:41 matt Exp
 #endif
 
 #include <machine/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>