Module Name: src
Committed By: matt
Date: Thu Feb 25 23:33:45 UTC 2010
Modified Files:
src/sys/arch/amigappc/amigappc: locore.S
src/sys/arch/bebox/bebox: locore.S
src/sys/arch/evbppc/ev64260: ev64260_locore.S
src/sys/arch/evbppc/explora: explora_start.S machdep.c
src/sys/arch/evbppc/obs405: obs200_locore.S obs200_machdep.c
obs266_machdep.c
src/sys/arch/evbppc/pmppc: pmppc_locore.S
src/sys/arch/evbppc/virtex: machdep.c virtex_start.S
src/sys/arch/evbppc/walnut: machdep.c walnut_start.S
src/sys/arch/ibmnws/ibmnws: locore.S
src/sys/arch/macppc/dev: if_bm.c
src/sys/arch/macppc/macppc: locore.S
src/sys/arch/mvmeppc/mvmeppc: locore.S
src/sys/arch/ofppc/ofppc: locore.S machdep.c
src/sys/arch/rs6000/rs6000: locore.S
src/sys/arch/sandpoint/sandpoint: locore.S
Log Message:
Adapt to <spr.h> breakup.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/amigappc/amigappc/locore.S
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/bebox/bebox/locore.S
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbppc/ev64260/ev64260_locore.S
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/explora/explora_start.S
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbppc/explora/machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/obs405/obs200_locore.S
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/obs405/obs200_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/obs405/obs266_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/pmppc/pmppc_locore.S
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbppc/virtex/machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/virtex/virtex_start.S
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/evbppc/walnut/machdep.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbppc/walnut/walnut_start.S
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ibmnws/ibmnws/locore.S
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/macppc/dev/if_bm.c
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/macppc/macppc/locore.S
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mvmeppc/mvmeppc/locore.S
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/ofppc/ofppc/locore.S
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/ofppc/ofppc/machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/rs6000/rs6000/locore.S
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sandpoint/sandpoint/locore.S
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/amigappc/amigappc/locore.S
diff -u src/sys/arch/amigappc/amigappc/locore.S:1.18 src/sys/arch/amigappc/amigappc/locore.S:1.19
--- src/sys/arch/amigappc/amigappc/locore.S:1.18 Tue Feb 2 20:56:13 2010
+++ src/sys/arch/amigappc/amigappc/locore.S Thu Feb 25 23:33:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.18 2010/02/02 20:56:13 phx Exp $ */
+/* $NetBSD: locore.S,v 1.19 2010/02/25 23:33:43 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -54,8 +54,9 @@
#define _NOREGNAMES
#include <machine/asm.h>
-#include <powerpc/oea/hid.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
+#include <powerpc/oea/hid.h>
#include <amiga/amiga/custom.h>
#include <amigappc/amigappc/p5reg.h>
Index: src/sys/arch/bebox/bebox/locore.S
diff -u src/sys/arch/bebox/bebox/locore.S:1.19 src/sys/arch/bebox/bebox/locore.S:1.20
--- src/sys/arch/bebox/bebox/locore.S:1.19 Thu Nov 26 00:19:13 2009
+++ src/sys/arch/bebox/bebox/locore.S Thu Feb 25 23:33:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.19 2009/11/26 00:19:13 matt Exp $ */
+/* $NetBSD: locore.S,v 1.20 2010/02/25 23:33:44 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -53,6 +53,7 @@
#include <machine/asm.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
/*
* Some instructions gas doesn't understand (yet?)
Index: src/sys/arch/evbppc/ev64260/ev64260_locore.S
diff -u src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.12 src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.13
--- src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.12 Thu Nov 26 00:19:16 2009
+++ src/sys/arch/evbppc/ev64260/ev64260_locore.S Thu Feb 25 23:33:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ev64260_locore.S,v 1.12 2009/11/26 00:19:16 matt Exp $ */
+/* $NetBSD: ev64260_locore.S,v 1.13 2010/02/25 23:33:44 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -52,6 +52,7 @@
#include <machine/asm.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
#include <powerpc/oea/bat.h>
#include <powerpc/oea/hid.h>
Index: src/sys/arch/evbppc/explora/explora_start.S
diff -u src/sys/arch/evbppc/explora/explora_start.S:1.6 src/sys/arch/evbppc/explora/explora_start.S:1.7
--- src/sys/arch/evbppc/explora/explora_start.S:1.6 Thu Nov 26 00:19:16 2009
+++ src/sys/arch/evbppc/explora/explora_start.S Thu Feb 25 23:33:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: explora_start.S,v 1.6 2009/11/26 00:19:16 matt Exp $ */
+/* $NetBSD: explora_start.S,v 1.7 2010/02/25 23:33:44 matt Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -49,6 +49,7 @@
#include <machine/asm.h>
#include <powerpc/spr.h>
+#include <powerpc/ibm4xx/spr.h>
#include <powerpc/ibm4xx/dcr403cgx.h>
#include <powerpc/ibm4xx/pmap.h>
Index: src/sys/arch/evbppc/explora/machdep.c
diff -u src/sys/arch/evbppc/explora/machdep.c:1.30 src/sys/arch/evbppc/explora/machdep.c:1.31
--- src/sys/arch/evbppc/explora/machdep.c:1.30 Mon Feb 8 19:02:28 2010
+++ src/sys/arch/evbppc/explora/machdep.c Thu Feb 25 23:33:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.30 2010/02/08 19:02:28 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.31 2010/02/25 23:33:44 matt Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.30 2010/02/08 19:02:28 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.31 2010/02/25 23:33:44 matt Exp $");
#include "opt_explora.h"
#include "opt_modular.h"
@@ -58,6 +58,7 @@
#include <machine/trap.h>
#include <powerpc/spr.h>
+#include <powerpc/ibm4xx/spr.h>
#include <powerpc/ibm4xx/dcr403cgx.h>
#if NKSYMS || defined(DDB) || defined(MODULAR)
Index: src/sys/arch/evbppc/obs405/obs200_locore.S
diff -u src/sys/arch/evbppc/obs405/obs200_locore.S:1.7 src/sys/arch/evbppc/obs405/obs200_locore.S:1.8
--- src/sys/arch/evbppc/obs405/obs200_locore.S:1.7 Thu Nov 26 00:19:16 2009
+++ src/sys/arch/evbppc/obs405/obs200_locore.S Thu Feb 25 23:33:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: obs200_locore.S,v 1.7 2009/11/26 00:19:16 matt Exp $ */
+/* $NetBSD: obs200_locore.S,v 1.8 2010/02/25 23:33:44 matt Exp $ */
/* Original Tag: locore.S,v 1.1 2003/09/23 15:21:58 shige Exp */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
@@ -89,6 +89,7 @@
#include <machine/asm.h>
#include <powerpc/spr.h>
+#include <powerpc/ibm4xx/spr.h>
#include <powerpc/ibm4xx/dcr405gp.h>
#include <powerpc/ibm4xx/pmap.h>
Index: src/sys/arch/evbppc/obs405/obs200_machdep.c
diff -u src/sys/arch/evbppc/obs405/obs200_machdep.c:1.9 src/sys/arch/evbppc/obs405/obs200_machdep.c:1.10
--- src/sys/arch/evbppc/obs405/obs200_machdep.c:1.9 Fri Feb 13 22:41:01 2009
+++ src/sys/arch/evbppc/obs405/obs200_machdep.c Thu Feb 25 23:33:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: obs200_machdep.c,v 1.9 2009/02/13 22:41:01 apb Exp $ */
+/* $NetBSD: obs200_machdep.c,v 1.10 2010/02/25 23:33:44 matt Exp $ */
/* Original: machdep.c,v 1.3 2005/01/17 17:24:09 shige Exp */
/*
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obs200_machdep.c,v 1.9 2009/02/13 22:41:01 apb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs200_machdep.c,v 1.10 2010/02/25 23:33:44 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -91,12 +91,13 @@
#include <machine/obs200.h>
#include <machine/century_bios.h>
#include <powerpc/spr.h>
+#include <powerpc/ibm4xx/spr.h>
+#include <powerpc/ibm4xx/dcr405gp.h>
+
#include <dev/pci/pcivar.h>
#include <dev/pci/pciconf.h>
-#include <powerpc/ibm4xx/dcr405gp.h>
-
#include "ksyms.h"
Index: src/sys/arch/evbppc/obs405/obs266_machdep.c
diff -u src/sys/arch/evbppc/obs405/obs266_machdep.c:1.10 src/sys/arch/evbppc/obs405/obs266_machdep.c:1.11
--- src/sys/arch/evbppc/obs405/obs266_machdep.c:1.10 Fri Feb 13 22:41:01 2009
+++ src/sys/arch/evbppc/obs405/obs266_machdep.c Thu Feb 25 23:33:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: obs266_machdep.c,v 1.10 2009/02/13 22:41:01 apb Exp $ */
+/* $NetBSD: obs266_machdep.c,v 1.11 2010/02/25 23:33:44 matt Exp $ */
/* Original: md_machdep.c,v 1.3 2005/01/24 18:47:37 shige Exp $ */
/*
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obs266_machdep.c,v 1.10 2009/02/13 22:41:01 apb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs266_machdep.c,v 1.11 2010/02/25 23:33:44 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -90,13 +90,13 @@
#include <machine/cpu.h>
#include <machine/obs266.h>
#include <powerpc/spr.h>
+#include <powerpc/ibm4xx/spr.h>
+#include <powerpc/ibm4xx/dcr405gp.h>
+#include <powerpc/ibm4xx/openbios.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pciconf.h>
-#include <powerpc/ibm4xx/dcr405gp.h>
-#include <powerpc/ibm4xx/openbios.h>
-
#include "ksyms.h"
Index: src/sys/arch/evbppc/pmppc/pmppc_locore.S
diff -u src/sys/arch/evbppc/pmppc/pmppc_locore.S:1.4 src/sys/arch/evbppc/pmppc/pmppc_locore.S:1.5
--- src/sys/arch/evbppc/pmppc/pmppc_locore.S:1.4 Thu Nov 26 00:19:16 2009
+++ src/sys/arch/evbppc/pmppc/pmppc_locore.S Thu Feb 25 23:33:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmppc_locore.S,v 1.4 2009/11/26 00:19:16 matt Exp $ */
+/* $NetBSD: pmppc_locore.S,v 1.5 2010/02/25 23:33:44 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -52,6 +52,7 @@
#include <machine/asm.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
#include <powerpc/oea/hid.h>
#include "ksyms.h"
Index: src/sys/arch/evbppc/virtex/machdep.c
diff -u src/sys/arch/evbppc/virtex/machdep.c:1.13 src/sys/arch/evbppc/virtex/machdep.c:1.14
--- src/sys/arch/evbppc/virtex/machdep.c:1.13 Mon Feb 8 19:02:28 2010
+++ src/sys/arch/evbppc/virtex/machdep.c Thu Feb 25 23:33:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.13 2010/02/08 19:02:28 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.14 2010/02/25 23:33:44 matt Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.13 2010/02/08 19:02:28 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14 2010/02/25 23:33:44 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -71,6 +71,7 @@
#include <machine/trap.h>
#include <powerpc/spr.h>
+#include <powerpc/ibm4xx/spr.h>
#include <evbppc/virtex/dcr.h>
#include <evbppc/virtex/virtex.h>
Index: src/sys/arch/evbppc/virtex/virtex_start.S
diff -u src/sys/arch/evbppc/virtex/virtex_start.S:1.4 src/sys/arch/evbppc/virtex/virtex_start.S:1.5
--- src/sys/arch/evbppc/virtex/virtex_start.S:1.4 Thu Nov 26 00:19:17 2009
+++ src/sys/arch/evbppc/virtex/virtex_start.S Thu Feb 25 23:33:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: virtex_start.S,v 1.4 2009/11/26 00:19:17 matt Exp $ */
+/* $NetBSD: virtex_start.S,v 1.5 2010/02/25 23:33:44 matt Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -54,6 +54,7 @@
#include <machine/asm.h>
#include <powerpc/spr.h>
+#include <powerpc/ibm4xx/spr.h>
#include <powerpc/ibm4xx/dcr405gp.h>
#include <powerpc/ibm4xx/pmap.h>
Index: src/sys/arch/evbppc/walnut/machdep.c
diff -u src/sys/arch/evbppc/walnut/machdep.c:1.44 src/sys/arch/evbppc/walnut/machdep.c:1.45
--- src/sys/arch/evbppc/walnut/machdep.c:1.44 Mon Feb 8 19:02:28 2010
+++ src/sys/arch/evbppc/walnut/machdep.c Thu Feb 25 23:33:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.44 2010/02/08 19:02:28 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.45 2010/02/25 23:33:44 matt Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.44 2010/02/08 19:02:28 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.45 2010/02/25 23:33:44 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -103,6 +103,7 @@
#include <machine/walnut.h>
#include <powerpc/spr.h>
+#include <powerpc/ibm4xx/spr.h>
#include <powerpc/ibm4xx/dcr405gp.h>
#include <dev/cons.h>
Index: src/sys/arch/evbppc/walnut/walnut_start.S
diff -u src/sys/arch/evbppc/walnut/walnut_start.S:1.17 src/sys/arch/evbppc/walnut/walnut_start.S:1.18
--- src/sys/arch/evbppc/walnut/walnut_start.S:1.17 Thu Nov 26 00:19:17 2009
+++ src/sys/arch/evbppc/walnut/walnut_start.S Thu Feb 25 23:33:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: walnut_start.S,v 1.17 2009/11/26 00:19:17 matt Exp $ */
+/* $NetBSD: walnut_start.S,v 1.18 2010/02/25 23:33:44 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -88,6 +88,7 @@
#include <machine/asm.h>
#include <powerpc/spr.h>
+#include <powerpc/ibm4xx/spr.h>
#include <powerpc/ibm4xx/dcr405gp.h>
#include <powerpc/ibm4xx/pmap.h>
Index: src/sys/arch/ibmnws/ibmnws/locore.S
diff -u src/sys/arch/ibmnws/ibmnws/locore.S:1.6 src/sys/arch/ibmnws/ibmnws/locore.S:1.7
--- src/sys/arch/ibmnws/ibmnws/locore.S:1.6 Thu Nov 26 00:19:18 2009
+++ src/sys/arch/ibmnws/ibmnws/locore.S Thu Feb 25 23:33:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.6 2009/11/26 00:19:18 matt Exp $ */
+/* $NetBSD: locore.S,v 1.7 2010/02/25 23:33:45 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -50,6 +50,7 @@
#include <machine/asm.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
#include <powerpc/oea/hid.h>
/*
Index: src/sys/arch/macppc/dev/if_bm.c
diff -u src/sys/arch/macppc/dev/if_bm.c:1.41 src/sys/arch/macppc/dev/if_bm.c:1.42
--- src/sys/arch/macppc/dev/if_bm.c:1.41 Tue Jan 19 22:06:21 2010
+++ src/sys/arch/macppc/dev/if_bm.c Thu Feb 25 23:33:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bm.c,v 1.41 2010/01/19 22:06:21 pooka Exp $ */
+/* $NetBSD: if_bm.c,v 1.42 2010/02/25 23:33:45 matt Exp $ */
/*-
* Copyright (C) 1998, 1999, 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bm.c,v 1.41 2010/01/19 22:06:21 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bm.c,v 1.42 2010/02/25 23:33:45 matt Exp $");
#include "opt_inet.h"
@@ -62,6 +62,7 @@
#include <dev/mii/mii_bitbang.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
#include <machine/autoconf.h>
#include <machine/pio.h>
Index: src/sys/arch/macppc/macppc/locore.S
diff -u src/sys/arch/macppc/macppc/locore.S:1.64 src/sys/arch/macppc/macppc/locore.S:1.65
--- src/sys/arch/macppc/macppc/locore.S:1.64 Thu Nov 26 00:19:18 2009
+++ src/sys/arch/macppc/macppc/locore.S Thu Feb 25 23:33:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.64 2009/11/26 00:19:18 matt Exp $ */
+/* $NetBSD: locore.S,v 1.65 2010/02/25 23:33:45 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -53,6 +53,8 @@
#include <machine/vmparam.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
+
/*
* Some instructions gas doesn't understand (yet?)
*/
Index: src/sys/arch/mvmeppc/mvmeppc/locore.S
diff -u src/sys/arch/mvmeppc/mvmeppc/locore.S:1.10 src/sys/arch/mvmeppc/mvmeppc/locore.S:1.11
--- src/sys/arch/mvmeppc/mvmeppc/locore.S:1.10 Thu Nov 26 00:19:19 2009
+++ src/sys/arch/mvmeppc/mvmeppc/locore.S Thu Feb 25 23:33:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.10 2009/11/26 00:19:19 matt Exp $ */
+/* $NetBSD: locore.S,v 1.11 2010/02/25 23:33:45 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -52,6 +52,7 @@
#include <machine/asm.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
#include "ksyms.h"
Index: src/sys/arch/ofppc/ofppc/locore.S
diff -u src/sys/arch/ofppc/ofppc/locore.S:1.42 src/sys/arch/ofppc/ofppc/locore.S:1.43
--- src/sys/arch/ofppc/ofppc/locore.S:1.42 Thu Nov 26 00:19:20 2009
+++ src/sys/arch/ofppc/ofppc/locore.S Thu Feb 25 23:33:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.42 2009/11/26 00:19:20 matt Exp $ */
+/* $NetBSD: locore.S,v 1.43 2010/02/25 23:33:45 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -50,6 +50,7 @@
#include <machine/vmparam.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
#include "ksyms.h"
Index: src/sys/arch/ofppc/ofppc/machdep.c
diff -u src/sys/arch/ofppc/ofppc/machdep.c:1.109 src/sys/arch/ofppc/ofppc/machdep.c:1.110
--- src/sys/arch/ofppc/ofppc/machdep.c:1.109 Wed Jan 20 17:12:08 2010
+++ src/sys/arch/ofppc/ofppc/machdep.c Thu Feb 25 23:33:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.109 2010/01/20 17:12:08 phx Exp $ */
+/* $NetBSD: machdep.c,v 1.110 2010/02/25 23:33:45 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.109 2010/01/20 17:12:08 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.110 2010/02/25 23:33:45 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,8 +50,9 @@
#include <machine/trap.h>
#include <machine/bus.h>
#include <machine/isa_machdep.h>
-#include <machine/spr.h>
+#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
#include <powerpc/oea/bat.h>
#include <powerpc/ofw_cons.h>
#include <powerpc/rtas.h>
Index: src/sys/arch/rs6000/rs6000/locore.S
diff -u src/sys/arch/rs6000/rs6000/locore.S:1.5 src/sys/arch/rs6000/rs6000/locore.S:1.6
--- src/sys/arch/rs6000/rs6000/locore.S:1.5 Thu Nov 26 00:19:21 2009
+++ src/sys/arch/rs6000/rs6000/locore.S Thu Feb 25 23:33:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.5 2009/11/26 00:19:21 matt Exp $ */
+/* $NetBSD: locore.S,v 1.6 2010/02/25 23:33:45 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -52,6 +52,7 @@
#include <machine/asm.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
#include "ksyms.h"
Index: src/sys/arch/sandpoint/sandpoint/locore.S
diff -u src/sys/arch/sandpoint/sandpoint/locore.S:1.16 src/sys/arch/sandpoint/sandpoint/locore.S:1.17
--- src/sys/arch/sandpoint/sandpoint/locore.S:1.16 Thu Nov 26 00:19:21 2009
+++ src/sys/arch/sandpoint/sandpoint/locore.S Thu Feb 25 23:33:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.16 2009/11/26 00:19:21 matt Exp $ */
+/* $NetBSD: locore.S,v 1.17 2010/02/25 23:33:45 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -52,6 +52,7 @@
#include <machine/asm.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
#include <powerpc/oea/hid.h>
#include "ksyms.h"
