Module Name: src
Committed By: matt
Date: Sun Aug 18 21:57:01 UTC 2013
Modified Files:
src/sys/arch/epoc32/epoc32: intr.c machdep.c
Log Message:
Fix <arm/locore.h> lossage
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/epoc32/epoc32/intr.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/epoc32/epoc32/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/epoc32/epoc32/intr.c
diff -u src/sys/arch/epoc32/epoc32/intr.c:1.1 src/sys/arch/epoc32/epoc32/intr.c:1.2
--- src/sys/arch/epoc32/epoc32/intr.c:1.1 Sun Apr 28 12:11:26 2013
+++ src/sys/arch/epoc32/epoc32/intr.c Sun Aug 18 21:57:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.1 2013/04/28 12:11:26 kiyohara Exp $ */
+/* $NetBSD: intr.c,v 1.2 2013/08/18 21:57:01 matt Exp $ */
/*
* Copyright (c) 2012 KIYOHARA Takashi
* All rights reserved.
@@ -26,11 +26,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.1 2013/04/28 12:11:26 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.2 2013/08/18 21:57:01 matt Exp $");
#include <sys/systm.h>
+#include <sys/cpu.h>
-#include <machine/cpu.h>
+#include <arm/locore.h>
#include <arm/pic/picvar.h>
Index: src/sys/arch/epoc32/epoc32/machdep.c
diff -u src/sys/arch/epoc32/epoc32/machdep.c:1.2 src/sys/arch/epoc32/epoc32/machdep.c:1.3
--- src/sys/arch/epoc32/epoc32/machdep.c:1.2 Thu Jun 20 13:40:09 2013
+++ src/sys/arch/epoc32/epoc32/machdep.c Sun Aug 18 21:57:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.2 2013/06/20 13:40:09 kiyohara Exp $ */
+/* $NetBSD: machdep.c,v 1.3 2013/08/18 21:57:01 matt Exp $ */
/*
* Copyright (c) 2012, 2013 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.2 2013/06/20 13:40:09 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.3 2013/08/18 21:57:01 matt Exp $");
#include "clpscom.h"
#include "clpslcd.h"
@@ -50,10 +50,13 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <uvm/uvm_extern.h>
+#include <dev/cons.h>
+#include <dev/md.h>
+
+#include <arm/locore.h>
+#include <arm/undefined.h>
#include <arm/arm32/machdep.h>
#include <arm/arm32/pmap.h>
-#include <arm/cpufunc.h>
-#include <arm/undefined.h>
#include <machine/bootconfig.h>
#include <machine/bootinfo.h>
@@ -64,9 +67,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <epoc32/windermere/windermerereg.h>
#include <epoc32/dev/epockbdvar.h>
-#include <dev/cons.h>
-#include <dev/md.h>
-
#include <machine/db_machdep.h>
#include <ddb/db_extern.h>
