Module Name: src
Committed By: matt
Date: Sun Aug 18 16:08:42 UTC 2013
Modified Files:
src/sys/arch/acorn26/acorn26: autoconf.c except.c start.c
src/sys/arch/acorn26/podulebus: podulebus.c
Log Message:
Fix <arm/locore.h> lossage.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/acorn26/acorn26/autoconf.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/acorn26/acorn26/except.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/acorn26/acorn26/start.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/acorn26/podulebus/podulebus.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/acorn26/acorn26/autoconf.c
diff -u src/sys/arch/acorn26/acorn26/autoconf.c:1.9 src/sys/arch/acorn26/acorn26/autoconf.c:1.10
--- src/sys/arch/acorn26/acorn26/autoconf.c:1.9 Sun Jul 29 18:05:39 2012
+++ src/sys/arch/acorn26/acorn26/autoconf.c Sun Aug 18 16:08:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.9 2012/07/29 18:05:39 mlelstv Exp $ */
+/* $NetBSD: autoconf.c,v 1.10 2013/08/18 16:08:42 matt Exp $ */
/*-
* Copyright (c) 1998, 1999 Ben Harris
* All rights reserved.
@@ -30,14 +30,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.9 2012/07/29 18:05:39 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.10 2013/08/18 16:08:42 matt Exp $");
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/systm.h>
+#include <sys/intr.h>
+
+#include <arm/locore.h>
-#include <machine/intr.h>
#include <machine/irq.h>
#include <machine/machdep.h>
Index: src/sys/arch/acorn26/acorn26/except.c
diff -u src/sys/arch/acorn26/acorn26/except.c:1.29 src/sys/arch/acorn26/acorn26/except.c:1.30
--- src/sys/arch/acorn26/acorn26/except.c:1.29 Thu Aug 16 17:35:01 2012
+++ src/sys/arch/acorn26/acorn26/except.c Sun Aug 18 16:08:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: except.c,v 1.29 2012/08/16 17:35:01 matt Exp $ */
+/* $NetBSD: except.c,v 1.30 2013/08/18 16:08:42 matt Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 Ben Harris
* All rights reserved.
@@ -31,7 +31,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: except.c,v 1.29 2012/08/16 17:35:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: except.c,v 1.30 2013/08/18 16:08:42 matt Exp $");
#include "opt_ddb.h"
@@ -43,12 +43,12 @@ __KERNEL_RCSID(0, "$NetBSD: except.c,v 1
#include <sys/cpu.h>
#include <sys/lwp.h>
#include <sys/proc.h>
+#include <sys/intr.h>
#include <uvm/uvm_extern.h>
-#include <arm/armreg.h>
-#include <arm/cpuconf.h>
-#include <machine/intr.h>
+#include <arm/locore.h>
+
#include <machine/machdep.h>
#include <machine/pcb.h>
Index: src/sys/arch/acorn26/acorn26/start.c
diff -u src/sys/arch/acorn26/acorn26/start.c:1.19 src/sys/arch/acorn26/acorn26/start.c:1.20
--- src/sys/arch/acorn26/acorn26/start.c:1.19 Thu Aug 16 18:15:10 2012
+++ src/sys/arch/acorn26/acorn26/start.c Sun Aug 18 16:08:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: start.c,v 1.19 2012/08/16 18:15:10 matt Exp $ */
+/* $NetBSD: start.c,v 1.20 2013/08/18 16:08:42 matt Exp $ */
/*-
* Copyright (c) 1998, 2000 Ben Harris
* All rights reserved.
@@ -31,7 +31,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: start.c,v 1.19 2012/08/16 18:15:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: start.c,v 1.20 2013/08/18 16:08:42 matt Exp $");
#include "opt_modular.h"
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: start.c,v 1.
#include <dev/i2c/i2cvar.h>
#include <acorn26/ioc/iociicvar.h>
-#include <arm/armreg.h>
+#include <arm/locore.h>
#include <arm/undefined.h>
#include <machine/boot.h>
#include <machine/machdep.h>
Index: src/sys/arch/acorn26/podulebus/podulebus.c
diff -u src/sys/arch/acorn26/podulebus/podulebus.c:1.20 src/sys/arch/acorn26/podulebus/podulebus.c:1.21
--- src/sys/arch/acorn26/podulebus/podulebus.c:1.20 Fri May 11 15:39:18 2012
+++ src/sys/arch/acorn26/podulebus/podulebus.c Sun Aug 18 16:08:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: podulebus.c,v 1.20 2012/05/11 15:39:18 skrll Exp $ */
+/* $NetBSD: podulebus.c,v 1.21 2013/08/18 16:08:42 matt Exp $ */
/*-
* Copyright (c) 2000 Ben Harris
@@ -28,15 +28,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.20 2012/05/11 15:39:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.21 2013/08/18 16:08:42 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/systm.h>
#include <sys/bus.h>
+#include <sys/intr.h>
+
+#include <arm/locore.h>
-#include <machine/intr.h>
#include <machine/irq.h>
#include <machine/machdep.h>
#include <machine/memcreg.h>
