Module Name: src
Committed By: matt
Date: Sun Aug 18 22:26:51 UTC 2013
Modified Files:
src/sys/arch/hpcarm/hpcarm: hpc_machdep.c sa11x0_hpc_machdep.c
Log Message:
Fix <arm/locore.h> lossage
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/hpcarm/hpcarm/hpc_machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_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/hpcarm/hpcarm/hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.101 src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.102
--- src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.101 Sun Jul 29 00:07:06 2012
+++ src/sys/arch/hpcarm/hpcarm/hpc_machdep.c Sun Aug 18 22:26:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: hpc_machdep.c,v 1.101 2012/07/29 00:07:06 matt Exp $ */
+/* $NetBSD: hpc_machdep.c,v 1.102 2013/08/18 22:26:51 matt Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.101 2012/07/29 00:07:06 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.102 2013/08/18 22:26:51 matt Exp $");
#include "opt_cputypes.h"
#include "opt_kloader.h"
@@ -54,10 +54,11 @@ __KERNEL_RCSID(0, "$NetBSD: hpc_machdep.
#include <sys/mount.h>
#include <sys/pmf.h>
#include <sys/reboot.h>
+#include <sys/cpu.h>
#include <uvm/uvm.h>
-#include <arm/cpufunc.h>
+#include <arm/locore.h>
#include <machine/bootconfig.h>
#include <machine/bootinfo.h>
Index: src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.7 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.8
--- src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.7 Sat Sep 22 00:33:41 2012
+++ src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c Sun Aug 18 22:26:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sa11x0_hpc_machdep.c,v 1.7 2012/09/22 00:33:41 matt Exp $ */
+/* $NetBSD: sa11x0_hpc_machdep.c,v 1.8 2013/08/18 22:26:51 matt Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.7 2012/09/22 00:33:41 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.8 2013/08/18 22:26:51 matt Exp $");
#include "opt_ddb.h"
#include "opt_dram_pages.h"
@@ -60,6 +60,8 @@ __KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_m
#include <sys/device.h>
#include <sys/termios.h>
#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
#if NKSYMS || defined(DDB) || defined(MODULAR)
#include <machine/db_machdep.h>
@@ -76,14 +78,11 @@ __KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_m
#include <arm/arm32/machdep.h>
#include <arm/sa11x0/sa11x0_reg.h>
-#include <arm/cpuconf.h>
+#include <arm/locore.h>
#include <arm/undefined.h>
#include <machine/bootconfig.h>
#include <machine/bootinfo.h>
-#include <machine/cpu.h>
-#include <machine/frame.h>
-#include <machine/intr.h>
#include <machine/io.h>
#include <machine/platid.h>
#include <machine/platid_mask.h>
