[src/trunk]: src/sys Use <arm/locore.h>

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

details:   https://anonhg.NetBSD.org/src/rev/d516442d3865
branches:  trunk
changeset: 789400:d516442d3865
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Aug 18 07:01:45 2013 +0000

description:
Use <arm/locore.h>

diffstat:

 sys/arch/arm/arm/linux_syscall.c          |   9 ++++-----
 sys/arch/shark/ofw/ofw.c                  |  12 +++++++-----
 sys/arch/shark/shark/shark_machdep.c      |  25 ++++++++++++-------------
 sys/compat/linux/arch/arm/linux_machdep.c |   7 +++++--
 4 files changed, 28 insertions(+), 25 deletions(-)

diffs (169 lines):

diff -r 4673341a5b42 -r d516442d3865 sys/arch/arm/arm/linux_syscall.c
--- a/sys/arch/arm/arm/linux_syscall.c  Sun Aug 18 06:50:31 2013 +0000
+++ b/sys/arch/arm/arm/linux_syscall.c  Sun Aug 18 07:01:45 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_syscall.c,v 1.24 2012/11/12 18:00:35 skrll Exp $ */
+/*     $NetBSD: linux_syscall.c,v 1.25 2013/08/18 07:01:45 matt Exp $  */
 
 /*-
  * Copyright (c) 2000, 2003 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: linux_syscall.c,v 1.24 2012/11/12 18:00:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscall.c,v 1.25 2013/08/18 07:01:45 matt Exp $");
 
 #include <sys/device.h>
 #include <sys/errno.h>
@@ -78,13 +78,12 @@
 #include <sys/signalvar.h>
 #include <sys/systm.h>
 #include <sys/syscallvar.h>
+#include <sys/cpu.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/cpu.h>
-#include <machine/frame.h>
-#include <machine/pcb.h>
 #include <arm/swi.h>
+#include <arm/locore.h>
 
 #include <compat/linux/common/linux_errno.h>
 #include <compat/linux/linux_syscall.h>
diff -r 4673341a5b42 -r d516442d3865 sys/arch/shark/ofw/ofw.c
--- a/sys/arch/shark/ofw/ofw.c  Sun Aug 18 06:50:31 2013 +0000
+++ b/sys/arch/shark/ofw/ofw.c  Sun Aug 18 07:01:45 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ofw.c,v 1.60 2012/09/22 00:33:41 matt Exp $    */
+/*     $NetBSD: ofw.c,v 1.61 2013/08/18 07:01:45 matt Exp $    */
 
 /*
  * Copyright 1997
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw.c,v 1.60 2012/09/22 00:33:41 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw.c,v 1.61 2013/08/18 07:01:45 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -49,6 +49,8 @@
 #include <sys/kernel.h>
 #include <sys/reboot.h>
 #include <sys/mbuf.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
 
 #include <uvm/uvm.h>
 
@@ -56,10 +58,10 @@
 
 #define        _ARM32_BUS_DMA_PRIVATE
 #include <sys/bus.h>
-#include <machine/frame.h>
+
+#include <arm/locore.h>
+
 #include <machine/bootconfig.h>
-#include <machine/cpu.h>
-#include <machine/intr.h>
 #include <machine/irqhandler.h>
 
 #include <dev/ofw/openfirm.h>
diff -r 4673341a5b42 -r d516442d3865 sys/arch/shark/shark/shark_machdep.c
--- a/sys/arch/shark/shark/shark_machdep.c      Sun Aug 18 06:50:31 2013 +0000
+++ b/sys/arch/shark/shark/shark_machdep.c      Sun Aug 18 07:01:45 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: shark_machdep.c,v 1.40 2012/07/29 00:07:06 matt Exp $  */
+/*     $NetBSD: shark_machdep.c,v 1.41 2013/08/18 07:01:45 matt Exp $  */
 
 /*
  * Copyright 1997
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: shark_machdep.c,v 1.40 2012/07/29 00:07:06 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shark_machdep.c,v 1.41 2013/08/18 07:01:45 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_modular.h"
@@ -53,30 +53,29 @@
 #include <sys/exec.h>
 #include <sys/ksyms.h>
 #include <sys/device.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <arm/fiq.h>
-
 #include <dev/cons.h>
+#include <dev/ofw/openfirm.h>
+#include <dev/isa/isavar.h>
+#include <dev/ofisa/ofisavar.h>
 
 #include <machine/db_machdep.h>
 #include <ddb/db_sym.h>
 #include <ddb/db_extern.h>
 
-#include <machine/frame.h>
+#include <arm/fiq.h>
+#include <arm/locore.h>
+#include <arm/undefined.h>
+#include <arm/arm32/machdep.h>
+
 #include <machine/bootconfig.h>
-#include <machine/cpu.h>
-#include <machine/intr.h>
 #include <machine/pio.h>
-#include <arm/arm32/machdep.h>
-#include <arm/undefined.h>
-
-#include <dev/ofw/openfirm.h>
 #include <machine/ofw.h>
 #include <machine/isa_machdep.h>
-#include <dev/isa/isavar.h>
-#include <dev/ofisa/ofisavar.h>
 #include <shark/shark/sequoia.h>
 
 #include "isadma.h"
diff -r 4673341a5b42 -r d516442d3865 sys/compat/linux/arch/arm/linux_machdep.c
--- a/sys/compat/linux/arch/arm/linux_machdep.c Sun Aug 18 06:50:31 2013 +0000
+++ b/sys/compat/linux/arch/arm/linux_machdep.c Sun Aug 18 07:01:45 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_machdep.c,v 1.30 2012/08/16 16:41:53 matt Exp $  */
+/*     $NetBSD: linux_machdep.c,v 1.31 2013/08/18 07:01:45 matt Exp $  */
 
 /*-
  * Copyright (c) 1995, 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.30 2012/08/16 16:41:53 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.31 2013/08/18 07:01:45 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -55,6 +55,7 @@
 #include <sys/exec_elf.h>
 #include <sys/disklabel.h>
 #include <sys/ioctl.h>
+
 #include <miscfs/specfs/specdev.h>
 
 #include <compat/linux/common/linux_types.h>
@@ -66,6 +67,8 @@
 #include <compat/linux/common/linux_machdep.h>
 #include <compat/linux/linux_syscallargs.h>
 
+#include <arm/locore.h>
+
 void
 linux_setregs(struct lwp *l, struct exec_package *epp, vaddr_t stack)
 {