Module Name: src
Committed By: matt
Date: Sun Aug 18 06:50:31 UTC 2013
Modified Files:
src/sys/arch/arm/arm: compat_13_machdep.c compat_16_machdep.c cpufunc.c
src/sys/arch/arm/arm32: pmap.c
src/sys/arch/cats/cats: cats_machdep.c
Log Message:
Include <arm/locore.h>
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/arm/compat_13_machdep.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/arm/compat_16_machdep.c
cvs rdiff -u -r1.123 -r1.124 src/sys/arch/arm/arm/cpufunc.c
cvs rdiff -u -r1.262 -r1.263 src/sys/arch/arm/arm32/pmap.c
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/cats/cats/cats_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/compat_13_machdep.c
diff -u src/sys/arch/arm/arm/compat_13_machdep.c:1.17 src/sys/arch/arm/arm/compat_13_machdep.c:1.18
--- src/sys/arch/arm/arm/compat_13_machdep.c:1.17 Thu Aug 16 17:35:01 2012
+++ src/sys/arch/arm/arm/compat_13_machdep.c Sun Aug 18 06:50:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_13_machdep.c,v 1.17 2012/08/16 17:35:01 matt Exp $ */
+/* $NetBSD: compat_13_machdep.c,v 1.18 2013/08/18 06:50:31 matt Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -38,7 +38,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.17 2012/08/16 17:35:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.18 2013/08/18 06:50:31 matt Exp $");
#include <sys/systm.h>
#include <sys/signalvar.h>
@@ -50,6 +50,8 @@ __KERNEL_RCSID(0, "$NetBSD: compat_13_ma
#include <compat/sys/signal.h>
#include <compat/sys/signalvar.h>
+#include <arm/locore.h>
+
int
compat_13_sys_sigreturn(struct lwp *l, const struct compat_13_sys_sigreturn_args *uap, register_t *retval)
{
Index: src/sys/arch/arm/arm/compat_16_machdep.c
diff -u src/sys/arch/arm/arm/compat_16_machdep.c:1.16 src/sys/arch/arm/arm/compat_16_machdep.c:1.17
--- src/sys/arch/arm/arm/compat_16_machdep.c:1.16 Thu Aug 16 17:35:01 2012
+++ src/sys/arch/arm/arm/compat_16_machdep.c Sun Aug 18 06:50:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_16_machdep.c,v 1.16 2012/08/16 17:35:01 matt Exp $ */
+/* $NetBSD: compat_16_machdep.c,v 1.17 2013/08/18 06:50:31 matt Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,7 +42,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.16 2012/08/16 17:35:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.17 2013/08/18 06:50:31 matt Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -59,6 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: compat_16_ma
#include <sys/ucontext.h>
#include <arm/armreg.h>
+#include <arm/locore.h>
#include <machine/cpu.h>
#include <machine/frame.h>
Index: src/sys/arch/arm/arm/cpufunc.c
diff -u src/sys/arch/arm/arm/cpufunc.c:1.123 src/sys/arch/arm/arm/cpufunc.c:1.124
--- src/sys/arch/arm/arm/cpufunc.c:1.123 Tue Jun 18 15:27:05 2013
+++ src/sys/arch/arm/arm/cpufunc.c Sun Aug 18 06:50:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.123 2013/06/18 15:27:05 matt Exp $ */
+/* $NetBSD: cpufunc.c,v 1.124 2013/08/18 06:50:31 matt Exp $ */
/*
* arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.123 2013/06/18 15:27:05 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.124 2013/08/18 06:50:31 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_cpuoptions.h"
@@ -67,6 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v
#include <arm/cpuconf.h>
#include <arm/cpufunc.h>
+#include <arm/locore.h>
#ifdef CPU_XSCALE_80200
#include <arm/xscale/i80200reg.h>
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.262 src/sys/arch/arm/arm32/pmap.c:1.263
--- src/sys/arch/arm/arm32/pmap.c:1.262 Wed Jul 3 21:37:35 2013
+++ src/sys/arch/arm/arm32/pmap.c Sun Aug 18 06:50:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.262 2013/07/03 21:37:35 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.263 2013/08/18 06:50:31 matt Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -202,17 +202,14 @@
#include <sys/cdefs.h>
#include <sys/cpu.h>
#include <sys/sysctl.h>
+#include <sys/bus.h>
#include <uvm/uvm.h>
-#include <sys/bus.h>
-#include <machine/pmap.h>
-#include <machine/pcb.h>
-#include <machine/param.h>
-#include <arm/cpuconf.h>
+#include <arm/locore.h>
#include <arm/arm32/katelib.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.262 2013/07/03 21:37:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.263 2013/08/18 06:50:31 matt Exp $");
#ifdef PMAP_DEBUG
Index: src/sys/arch/cats/cats/cats_machdep.c
diff -u src/sys/arch/cats/cats/cats_machdep.c:1.76 src/sys/arch/cats/cats/cats_machdep.c:1.77
--- src/sys/arch/cats/cats/cats_machdep.c:1.76 Sat Oct 13 17:58:55 2012
+++ src/sys/arch/cats/cats/cats_machdep.c Sun Aug 18 06:50:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cats_machdep.c,v 1.76 2012/10/13 17:58:55 jdc Exp $ */
+/* $NetBSD: cats_machdep.c,v 1.77 2013/08/18 06:50:31 matt Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.76 2012/10/13 17:58:55 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.77 2013/08/18 06:50:31 matt Exp $");
#include "opt_ddb.h"
#include "opt_modular.h"
@@ -59,6 +59,8 @@ __KERNEL_RCSID(0, "$NetBSD: cats_machdep
#include <sys/reboot.h>
#include <sys/termios.h>
#include <sys/ksyms.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
#include <dev/cons.h>
@@ -69,9 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: cats_machdep
#include <machine/bootconfig.h>
#define _ARM32_BUS_DMA_PRIVATE
#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>
