Module Name: src
Committed By: matt
Date: Sun Aug 18 15:58:21 UTC 2013
Modified Files:
src/sys/arch/arm/arm: cpu_in_cksum.S
src/sys/arch/arm/at91: at91bus.c
src/sys/arch/arm/ep93xx: ep93xx_intr.c
src/sys/arch/arm/gemini: gemini_pci.c
src/sys/arch/arm/include: cpu.h
src/sys/arch/arm/ixp12x0: ixp12x0_intr.c ixp12x0_pci.c
src/sys/arch/arm/omap: omap_intr.h
src/sys/arch/arm/s3c2xx0: s3c2800_pci.c
src/sys/arch/arm/xscale: becc_pci.c i80312_pci.c i80321_pci.c
src/sys/arch/evbarm/adi_brh: brh_machdep.c
src/sys/arch/evbarm/armadillo: armadillo9_machdep.c
src/sys/arch/evbarm/g42xxeb: g42xxeb_machdep.c
src/sys/arch/evbarm/gemini: gemini_machdep.c
src/sys/arch/evbarm/gumstix: gumstix_machdep.c gumstix_start.S
src/sys/arch/evbarm/hdl_g: hdlg_machdep.c
src/sys/arch/evbarm/ifpga: ifpgavar.h
src/sys/arch/evbarm/imx31: imx31lk_machdep.c
src/sys/arch/evbarm/integrator: integrator_machdep.c
src/sys/arch/evbarm/iq80310: iq80310_machdep.c
src/sys/arch/evbarm/iq80321: iq80321_machdep.c iq80321_pci.c
src/sys/arch/evbarm/ixdp425: ixdp425_machdep.c
src/sys/arch/evbarm/ixm1200: ixm1200_machdep.c
src/sys/arch/evbarm/lubbock: lubbock_machdep.c
src/sys/arch/evbarm/mpcsa: mpcsa_machdep.c
src/sys/arch/evbarm/netwalker: netwalker_machdep.c
src/sys/arch/evbarm/osk5912: osk5912_machdep.c
src/sys/arch/evbarm/smdk2xx0: smdk2410_machdep.c smdk2800_machdep.c
src/sys/arch/evbarm/tisdp24xx: sdp24xx_machdep.c
src/sys/arch/evbarm/tsarm: tsarm_machdep.c
src/sys/arch/evbarm/viper: viper_machdep.c
Log Message:
<arm/locore.h> fallout (fixes some include ordering errors)
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/arm/cpu_in_cksum.S
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/at91/at91bus.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/ep93xx/ep93xx_intr.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/gemini/gemini_pci.c
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/arm/include/cpu.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/ixp12x0/ixp12x0_intr.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/ixp12x0/ixp12x0_pci.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/omap/omap_intr.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/s3c2xx0/s3c2800_pci.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/xscale/becc_pci.c \
src/sys/arch/arm/xscale/i80312_pci.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/xscale/i80321_pci.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/evbarm/adi_brh/brh_machdep.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/gemini/gemini_machdep.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/evbarm/gumstix/gumstix_machdep.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/gumstix/gumstix_start.S
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/hdl_g/hdlg_machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/ifpga/ifpgavar.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/imx31/imx31lk_machdep.c
cvs rdiff -u -r1.73 -r1.74 \
src/sys/arch/evbarm/integrator/integrator_machdep.c
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/evbarm/iq80310/iq80310_machdep.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/evbarm/iq80321/iq80321_machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/iq80321/iq80321_pci.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbarm/lubbock/lubbock_machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/netwalker/netwalker_machdep.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/osk5912/osk5912_machdep.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/tsarm/tsarm_machdep.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbarm/viper/viper_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/cpu_in_cksum.S
diff -u src/sys/arch/arm/arm/cpu_in_cksum.S:1.5 src/sys/arch/arm/arm/cpu_in_cksum.S:1.6
--- src/sys/arch/arm/arm/cpu_in_cksum.S:1.5 Sun Aug 18 05:54:16 2013
+++ src/sys/arch/arm/arm/cpu_in_cksum.S Sun Aug 18 15:58:19 2013
@@ -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
+ eors r0, r0, r7 /* r0 is word aligned */
+ ldr r2, [r0], #0x04
+#ifdef __thumb__
+ movs r4, r7
+ lsls r4, r4, #3
+#else
+ lsl r4, r7, #3
+#endif
+#if defined(__ARMEB__)
+ lsls r2, r2, r4
+ lsrs r2, r2, r4
+#else
+ lsrs r2, r2, r4
+ lsls r2, r2, r4
+#endif
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
-#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
+ 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
- subs r1, r1, r7 /* Update length */
#ifdef __PROG26
- ldreq pc, [sp], #4 /* All done? */
+ ldr pc, [sp], #4 /* done */
#else
- RETc(eq) /* All done? */
+ 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
-#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
+ lsr r3, r3, r1 /* discard least significant bits */
+ lsl r3, r3, r1 /* shift back filling with zeros */
+#else
+ 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
Index: src/sys/arch/arm/at91/at91bus.c
diff -u src/sys/arch/arm/at91/at91bus.c:1.16 src/sys/arch/arm/at91/at91bus.c:1.17
--- src/sys/arch/arm/at91/at91bus.c:1.16 Mon Nov 12 18:00:36 2012
+++ src/sys/arch/arm/at91/at91bus.c Sun Aug 18 15:58:19 2013
@@ -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
#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
#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
Index: src/sys/arch/arm/ep93xx/ep93xx_intr.c
diff -u src/sys/arch/arm/ep93xx/ep93xx_intr.c:1.18 src/sys/arch/arm/ep93xx/ep93xx_intr.c:1.19
--- src/sys/arch/arm/ep93xx/ep93xx_intr.c:1.18 Mon Nov 12 18:00:36 2012
+++ src/sys/arch/arm/ep93xx/ep93xx_intr.c Sun Aug 18 15:58:19 2013
@@ -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.
#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>
Index: src/sys/arch/arm/gemini/gemini_pci.c
diff -u src/sys/arch/arm/gemini/gemini_pci.c:1.14 src/sys/arch/arm/gemini/gemini_pci.c:1.15
--- src/sys/arch/arm/gemini/gemini_pci.c:1.14 Sat Oct 27 17:17:38 2012
+++ src/sys/arch/arm/gemini/gemini_pci.c Sun Aug 18 15:58:19 2013
@@ -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
#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);
Index: src/sys/arch/arm/include/cpu.h
diff -u src/sys/arch/arm/include/cpu.h:1.78 src/sys/arch/arm/include/cpu.h:1.79
--- src/sys/arch/arm/include/cpu.h:1.78 Sun Aug 18 07:36:39 2013
+++ src/sys/arch/arm/include/cpu.h Sun Aug 18 15:58:19 2013
@@ -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;
Index: src/sys/arch/arm/ixp12x0/ixp12x0_intr.c
diff -u src/sys/arch/arm/ixp12x0/ixp12x0_intr.c:1.24 src/sys/arch/arm/ixp12x0/ixp12x0_intr.c:1.25
--- src/sys/arch/arm/ixp12x0/ixp12x0_intr.c:1.24 Mon Nov 12 18:00:37 2012
+++ src/sys/arch/arm/ixp12x0/ixp12x0_intr.c Sun Aug 18 15:58:19 2013
@@ -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
#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>
Index: src/sys/arch/arm/ixp12x0/ixp12x0_pci.c
diff -u src/sys/arch/arm/ixp12x0/ixp12x0_pci.c:1.13 src/sys/arch/arm/ixp12x0/ixp12x0_pci.c:1.14
--- src/sys/arch/arm/ixp12x0/ixp12x0_pci.c:1.13 Sat Oct 27 17:17:39 2012
+++ src/sys/arch/arm/ixp12x0/ixp12x0_pci.c Sun Aug 18 15:58:19 2013
@@ -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.
#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 *);
Index: src/sys/arch/arm/omap/omap_intr.h
diff -u src/sys/arch/arm/omap/omap_intr.h:1.8 src/sys/arch/arm/omap/omap_intr.h:1.9
--- src/sys/arch/arm/omap/omap_intr.h:1.8 Sat Sep 1 14:48:29 2012
+++ src/sys/arch/arm/omap/omap_intr.h Sun Aug 18 15:58:19 2013
@@ -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>
Index: src/sys/arch/arm/s3c2xx0/s3c2800_pci.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2800_pci.c:1.19 src/sys/arch/arm/s3c2xx0/s3c2800_pci.c:1.20
--- src/sys/arch/arm/s3c2xx0/s3c2800_pci.c:1.19 Sat Oct 27 17:17:40 2012
+++ src/sys/arch/arm/s3c2xx0/s3c2800_pci.c Sun Aug 18 15:58:19 2013
@@ -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.
#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.
Index: src/sys/arch/arm/xscale/becc_pci.c
diff -u src/sys/arch/arm/xscale/becc_pci.c:1.13 src/sys/arch/arm/xscale/becc_pci.c:1.14
--- src/sys/arch/arm/xscale/becc_pci.c:1.13 Sun Oct 14 14:20:57 2012
+++ src/sys/arch/arm/xscale/becc_pci.c Sun Aug 18 15:58:20 2013
@@ -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,26 +41,28 @@
*/
#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 <uvm/uvm_extern.h>
-
#include <sys/bus.h>
-#include <arm/xscale/beccreg.h>
-#include <arm/xscale/beccvar.h>
+#include <uvm/uvm_extern.h>
#include <dev/pci/ppbreg.h>
+#include <dev/pci/pcivar.h>
#include <dev/pci/pciconf.h>
-#include "opt_pci.h"
-#include "pci.h"
+#include <arm/locore.h>
+
+#include <arm/xscale/beccreg.h>
+#include <arm/xscale/beccvar.h>
void becc_pci_attach_hook(device_t, device_t,
struct pcibus_attach_args *);
Index: src/sys/arch/arm/xscale/i80312_pci.c
diff -u src/sys/arch/arm/xscale/i80312_pci.c:1.13 src/sys/arch/arm/xscale/i80312_pci.c:1.14
--- src/sys/arch/arm/xscale/i80312_pci.c:1.13 Sun Oct 14 14:20:57 2012
+++ src/sys/arch/arm/xscale/i80312_pci.c Sun Aug 18 15:58:20 2013
@@ -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);
Index: src/sys/arch/arm/xscale/i80321_pci.c
diff -u src/sys/arch/arm/xscale/i80321_pci.c:1.14 src/sys/arch/arm/xscale/i80321_pci.c:1.15
--- src/sys/arch/arm/xscale/i80321_pci.c:1.14 Sun Oct 14 14:20:57 2012
+++ src/sys/arch/arm/xscale/i80321_pci.c Sun Aug 18 15:58:20 2013
@@ -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);
Index: src/sys/arch/evbarm/adi_brh/brh_machdep.c
diff -u src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.41 src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.42
--- src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.41 Sat Sep 22 00:33:38 2012
+++ src/sys/arch/evbarm/adi_brh/brh_machdep.c Sun Aug 18 15:58:20 2013
@@ -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.
#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.
#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>
Index: src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
diff -u src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.26 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.27
--- src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.26 Mon Nov 12 18:00:38 2012
+++ src/sys/arch/evbarm/armadillo/armadillo9_machdep.c Sun Aug 18 15:58:20 2013
@@ -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_m
#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_m
#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 */
Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.27 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.28
--- src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.27 Sat Sep 22 00:33:38 2012
+++ src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c Sun Aug 18 15:58:20 2013
@@ -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>
Index: src/sys/arch/evbarm/gemini/gemini_machdep.c
diff -u src/sys/arch/evbarm/gemini/gemini_machdep.c:1.21 src/sys/arch/evbarm/gemini/gemini_machdep.c:1.22
--- src/sys/arch/evbarm/gemini/gemini_machdep.c:1.21 Sat Sep 22 00:33:38 2012
+++ src/sys/arch/evbarm/gemini/gemini_machdep.c Sun Aug 18 15:58:20 2013
@@ -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_machd
#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_machd
#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>
Index: src/sys/arch/evbarm/gumstix/gumstix_machdep.c
diff -u src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.46 src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.47
--- src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.46 Mon Dec 24 06:53:26 2012
+++ src/sys/arch/evbarm/gumstix/gumstix_machdep.c Sun Aug 18 15:58:20 2013
@@ -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>
Index: src/sys/arch/evbarm/gumstix/gumstix_start.S
diff -u src/sys/arch/evbarm/gumstix/gumstix_start.S:1.11 src/sys/arch/evbarm/gumstix/gumstix_start.S:1.12
--- src/sys/arch/evbarm/gumstix/gumstix_start.S:1.11 Sat Dec 29 14:22:55 2012
+++ src/sys/arch/evbarm/gumstix/gumstix_start.S Sun Aug 18 15:58:20 2013
@@ -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
Index: src/sys/arch/evbarm/hdl_g/hdlg_machdep.c
diff -u src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.20 src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.21
--- src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.20 Sat Sep 22 00:33:39 2012
+++ src/sys/arch/evbarm/hdl_g/hdlg_machdep.c Sun Aug 18 15:58:20 2013
@@ -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
#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
#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>
Index: src/sys/arch/evbarm/ifpga/ifpgavar.h
diff -u src/sys/arch/evbarm/ifpga/ifpgavar.h:1.7 src/sys/arch/evbarm/ifpga/ifpgavar.h:1.8
--- src/sys/arch/evbarm/ifpga/ifpgavar.h:1.7 Tue Feb 19 10:57:10 2013
+++ src/sys/arch/evbarm/ifpga/ifpgavar.h Sun Aug 18 15:58:20 2013
@@ -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. */
Index: src/sys/arch/evbarm/imx31/imx31lk_machdep.c
diff -u src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.16 src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.17
--- src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.16 Sat Sep 22 00:33:39 2012
+++ src/sys/arch/evbarm/imx31/imx31lk_machdep.c Sun Aug 18 15:58:20 2013
@@ -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_mach
#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_mach
#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>
Index: src/sys/arch/evbarm/integrator/integrator_machdep.c
diff -u src/sys/arch/evbarm/integrator/integrator_machdep.c:1.73 src/sys/arch/evbarm/integrator/integrator_machdep.c:1.74
--- src/sys/arch/evbarm/integrator/integrator_machdep.c:1.73 Tue Feb 19 10:57:10 2013
+++ src/sys/arch/evbarm/integrator/integrator_machdep.c Sun Aug 18 15:58:20 2013
@@ -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_m
#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_m
#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>
Index: src/sys/arch/evbarm/iq80310/iq80310_machdep.c
diff -u src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.83 src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.84
--- src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.83 Sat Sep 22 00:33:39 2012
+++ src/sys/arch/evbarm/iq80310/iq80310_machdep.c Sun Aug 18 15:58:20 2013
@@ -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_mach
#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_mach
#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>
Index: src/sys/arch/evbarm/iq80321/iq80321_machdep.c
diff -u src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.53 src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.54
--- src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.53 Sat Sep 22 00:33:39 2012
+++ src/sys/arch/evbarm/iq80321/iq80321_machdep.c Sun Aug 18 15:58:20 2013
@@ -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_mach
#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_mach
#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>
Index: src/sys/arch/evbarm/iq80321/iq80321_pci.c
diff -u src/sys/arch/evbarm/iq80321/iq80321_pci.c:1.7 src/sys/arch/evbarm/iq80321/iq80321_pci.c:1.8
--- src/sys/arch/evbarm/iq80321/iq80321_pci.c:1.7 Fri Jul 1 20:41:16 2011
+++ src/sys/arch/evbarm/iq80321/iq80321_pci.c Sun Aug 18 15:58:20 2013
@@ -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.
#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);
Index: src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
diff -u src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.33 src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.34
--- src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.33 Mon Nov 12 18:00:39 2012
+++ src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c Sun Aug 18 15:58:20 2013
@@ -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 <ich...@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_mach
#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_mach
#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>
Index: src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
diff -u src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.53 src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.54
--- src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.53 Mon Nov 12 18:00:39 2012
+++ src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c Sun Aug 18 15:58:20 2013
@@ -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_mach
#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_mach
#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>
Index: src/sys/arch/evbarm/lubbock/lubbock_machdep.c
diff -u src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.31 src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.32
--- src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.31 Sat Sep 22 00:33:40 2012
+++ src/sys/arch/evbarm/lubbock/lubbock_machdep.c Sun Aug 18 15:58:20 2013
@@ -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_mach
#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_mach
#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>
Index: src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c
diff -u src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c:1.8 src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c:1.9
--- src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c:1.8 Sat Oct 27 17:17:48 2012
+++ src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c Sun Aug 18 15:58:20 2013
@@ -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_machde
#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_machde
#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"
Index: src/sys/arch/evbarm/netwalker/netwalker_machdep.c
diff -u src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.10 src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.11
--- src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.10 Sat Sep 22 00:33:40 2012
+++ src/sys/arch/evbarm/netwalker/netwalker_machdep.c Sun Aug 18 15:58:21 2013
@@ -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_ma
#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_ma
#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>
Index: src/sys/arch/evbarm/osk5912/osk5912_machdep.c
diff -u src/sys/arch/evbarm/osk5912/osk5912_machdep.c:1.14 src/sys/arch/evbarm/osk5912/osk5912_machdep.c:1.15
--- src/sys/arch/evbarm/osk5912/osk5912_machdep.c:1.14 Sat Sep 22 00:33:40 2012
+++ src/sys/arch/evbarm/osk5912/osk5912_machdep.c Sun Aug 18 15:58:21 2013
@@ -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_mach
#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_mach
#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>
Index: src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
diff -u src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.32 src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.33
--- src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.32 Sat Sep 22 00:33:40 2012
+++ src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c Sun Aug 18 15:58:21 2013
@@ -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_mac
#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_mac
#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>
Index: src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
diff -u src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.40 src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.41
--- src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.40 Sat Sep 22 00:33:40 2012
+++ src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c Sun Aug 18 15:58:21 2013
@@ -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_mac
#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_mac
#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>
Index: src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
diff -u src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.15 src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.16
--- src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.15 Sat Sep 22 00:33:40 2012
+++ src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c Sun Aug 18 15:58:21 2013
@@ -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_mach
#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_mach
#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>
Index: src/sys/arch/evbarm/tsarm/tsarm_machdep.c
diff -u src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.20 src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.21
--- src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.20 Mon Nov 12 18:00:40 2012
+++ src/sys/arch/evbarm/tsarm/tsarm_machdep.c Sun Aug 18 15:58:21 2013
@@ -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_machde
#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_machde
#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 */
Index: src/sys/arch/evbarm/viper/viper_machdep.c
diff -u src/sys/arch/evbarm/viper/viper_machdep.c:1.22 src/sys/arch/evbarm/viper/viper_machdep.c:1.23
--- src/sys/arch/evbarm/viper/viper_machdep.c:1.22 Sat Sep 22 00:33:41 2012
+++ src/sys/arch/evbarm/viper/viper_machdep.c Sun Aug 18 15:58:21 2013
@@ -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_machde
#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_machde
#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>
