Module Name: src
Committed By: matt
Date: Sun Aug 18 07:01:45 UTC 2013
Modified Files:
src/sys/arch/arm/arm: linux_syscall.c
src/sys/arch/shark/ofw: ofw.c
src/sys/arch/shark/shark: shark_machdep.c
src/sys/compat/linux/arch/arm: linux_machdep.c
Log Message:
Use <arm/locore.h>
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/arm/linux_syscall.c
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/shark/ofw/ofw.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/shark/shark/shark_machdep.c
cvs rdiff -u -r1.30 -r1.31 src/sys/compat/linux/arch/arm/linux_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/linux_syscall.c
diff -u src/sys/arch/arm/arm/linux_syscall.c:1.24 src/sys/arch/arm/arm/linux_syscall.c:1.25
--- src/sys/arch/arm/arm/linux_syscall.c:1.24 Mon Nov 12 18:00:35 2012
+++ src/sys/arch/arm/arm/linux_syscall.c Sun Aug 18 07:01:45 2013
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: linux_syscal
#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>
Index: src/sys/arch/shark/ofw/ofw.c
diff -u src/sys/arch/shark/ofw/ofw.c:1.60 src/sys/arch/shark/ofw/ofw.c:1.61
--- src/sys/arch/shark/ofw/ofw.c:1.60 Sat Sep 22 00:33:41 2012
+++ src/sys/arch/shark/ofw/ofw.c Sun Aug 18 07:01:45 2013
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: ofw.c,v 1.60
#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 @@ __KERNEL_RCSID(0, "$NetBSD: ofw.c,v 1.60
#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>
Index: src/sys/arch/shark/shark/shark_machdep.c
diff -u src/sys/arch/shark/shark/shark_machdep.c:1.40 src/sys/arch/shark/shark/shark_machdep.c:1.41
--- src/sys/arch/shark/shark/shark_machdep.c:1.40 Sun Jul 29 00:07:06 2012
+++ src/sys/arch/shark/shark/shark_machdep.c Sun Aug 18 07:01:45 2013
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: shark_machde
#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 <machine/bootconfig.h>
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/pio.h>
-#include <arm/arm32/machdep.h>
+#include <arm/fiq.h>
+#include <arm/locore.h>
#include <arm/undefined.h>
+#include <arm/arm32/machdep.h>
-#include <dev/ofw/openfirm.h>
+#include <machine/bootconfig.h>
+#include <machine/pio.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"
Index: src/sys/compat/linux/arch/arm/linux_machdep.c
diff -u src/sys/compat/linux/arch/arm/linux_machdep.c:1.30 src/sys/compat/linux/arch/arm/linux_machdep.c:1.31
--- src/sys/compat/linux/arch/arm/linux_machdep.c:1.30 Thu Aug 16 16:41:53 2012
+++ src/sys/compat/linux/arch/arm/linux_machdep.c Sun Aug 18 07:01:45 2013
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: linux_machde
#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 @@ __KERNEL_RCSID(0, "$NetBSD: linux_machde
#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)
{
