Module Name: src
Committed By: matt
Date: Fri Jan 7 01:43:08 UTC 2011
Modified Files:
src/sys/arch/evbppc/ev64260 [matt-nb5-pq3]: ev64260_locore.S
src/sys/arch/evbppc/explora [matt-nb5-pq3]: explora_start.S machdep.c
src/sys/arch/evbppc/obs405 [matt-nb5-pq3]: obs200_locore.S
obs200_machdep.c obs266_machdep.c
src/sys/arch/evbppc/pmppc [matt-nb5-pq3]: pmppc_locore.S
src/sys/arch/evbppc/virtex [matt-nb5-pq3]: machdep.c virtex_start.S
src/sys/arch/evbppc/walnut [matt-nb5-pq3]: machdep.c walnut_start.S
Log Message:
Deal with the splitting of <spr.h>
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.28.1 src/sys/arch/evbppc/ev64260/ev64260_locore.S
cvs rdiff -u -r1.5 -r1.5.22.1 src/sys/arch/evbppc/explora/explora_start.S
cvs rdiff -u -r1.23 -r1.23.12.1 src/sys/arch/evbppc/explora/machdep.c
cvs rdiff -u -r1.4 -r1.4.74.1 src/sys/arch/evbppc/obs405/obs200_locore.S
cvs rdiff -u -r1.5 -r1.5.74.1 src/sys/arch/evbppc/obs405/obs200_machdep.c
cvs rdiff -u -r1.6 -r1.6.74.1 src/sys/arch/evbppc/obs405/obs266_machdep.c
cvs rdiff -u -r1.3 -r1.3.32.1 src/sys/arch/evbppc/pmppc/pmppc_locore.S
cvs rdiff -u -r1.6 -r1.6.14.1 src/sys/arch/evbppc/virtex/machdep.c
cvs rdiff -u -r1.1 -r1.1.72.1 src/sys/arch/evbppc/virtex/virtex_start.S
cvs rdiff -u -r1.36 -r1.36.14.1 src/sys/arch/evbppc/walnut/machdep.c
cvs rdiff -u -r1.14 -r1.14.74.1 src/sys/arch/evbppc/walnut/walnut_start.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/evbppc/ev64260/ev64260_locore.S
diff -u src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.9 src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.9.28.1
--- src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.9 Tue Feb 5 22:31:49 2008
+++ src/sys/arch/evbppc/ev64260/ev64260_locore.S Fri Jan 7 01:43:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ev64260_locore.S,v 1.9 2008/02/05 22:31:49 garbled Exp $ */
+/* $NetBSD: ev64260_locore.S,v 1.9.28.1 2011/01/07 01:43:07 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -51,6 +51,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.5 src/sys/arch/evbppc/explora/explora_start.S:1.5.22.1
--- src/sys/arch/evbppc/explora/explora_start.S:1.5 Mon Apr 28 20:23:17 2008
+++ src/sys/arch/evbppc/explora/explora_start.S Fri Jan 7 01:43:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: explora_start.S,v 1.5 2008/04/28 20:23:17 martin Exp $ */
+/* $NetBSD: explora_start.S,v 1.5.22.1 2011/01/07 01:43:07 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.23 src/sys/arch/evbppc/explora/machdep.c:1.23.12.1
--- src/sys/arch/evbppc/explora/machdep.c:1.23 Fri Aug 8 06:29:21 2008
+++ src/sys/arch/evbppc/explora/machdep.c Fri Jan 7 01:43:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.23 2008/08/08 06:29:21 hannken Exp $ */
+/* $NetBSD: machdep.c,v 1.23.12.1 2011/01/07 01:43:07 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.23 2008/08/08 06:29:21 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.23.12.1 2011/01/07 01:43:07 matt Exp $");
#include "opt_explora.h"
#include "ksyms.h"
@@ -56,6 +56,7 @@
#include <machine/trap.h>
#include <powerpc/spr.h>
+#include <powerpc/ibm4xx/spr.h>
#include <powerpc/ibm4xx/dcr403cgx.h>
#if NKSYMS || defined(DDB) || defined(LKM)
Index: src/sys/arch/evbppc/obs405/obs200_locore.S
diff -u src/sys/arch/evbppc/obs405/obs200_locore.S:1.4 src/sys/arch/evbppc/obs405/obs200_locore.S:1.4.74.1
--- src/sys/arch/evbppc/obs405/obs200_locore.S:1.4 Mon Oct 16 18:14:35 2006
+++ src/sys/arch/evbppc/obs405/obs200_locore.S Fri Jan 7 01:43:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obs200_locore.S,v 1.4 2006/10/16 18:14:35 kiyohara Exp $ */
+/* $NetBSD: obs200_locore.S,v 1.4.74.1 2011/01/07 01:43:07 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 $ */
@@ -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/evbppc/obs405/obs200_machdep.c
diff -u src/sys/arch/evbppc/obs405/obs200_machdep.c:1.5 src/sys/arch/evbppc/obs405/obs200_machdep.c:1.5.74.1
--- src/sys/arch/evbppc/obs405/obs200_machdep.c:1.5 Wed Nov 29 19:56:47 2006
+++ src/sys/arch/evbppc/obs405/obs200_machdep.c Fri Jan 7 01:43:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obs200_machdep.c,v 1.5 2006/11/29 19:56:47 freza Exp $ */
+/* $NetBSD: obs200_machdep.c,v 1.5.74.1 2011/01/07 01:43:08 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.5 2006/11/29 19:56:47 freza Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs200_machdep.c,v 1.5.74.1 2011/01/07 01:43:08 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -89,6 +89,7 @@
#include <machine/obs200.h>
#include <machine/century_bios.h>
#include <powerpc/spr.h>
+#include <powerpc/ibm4xx/spr.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pciconf.h>
Index: src/sys/arch/evbppc/obs405/obs266_machdep.c
diff -u src/sys/arch/evbppc/obs405/obs266_machdep.c:1.6 src/sys/arch/evbppc/obs405/obs266_machdep.c:1.6.74.1
--- src/sys/arch/evbppc/obs405/obs266_machdep.c:1.6 Wed Nov 29 19:56:47 2006
+++ src/sys/arch/evbppc/obs405/obs266_machdep.c Fri Jan 7 01:43:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obs266_machdep.c,v 1.6 2006/11/29 19:56:47 freza Exp $ */
+/* $NetBSD: obs266_machdep.c,v 1.6.74.1 2011/01/07 01:43:08 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.6 2006/11/29 19:56:47 freza Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs266_machdep.c,v 1.6.74.1 2011/01/07 01:43:08 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -88,6 +88,7 @@
#include <machine/cpu.h>
#include <machine/obs266.h>
#include <powerpc/spr.h>
+#include <powerpc/ibm4xx/spr.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pciconf.h>
Index: src/sys/arch/evbppc/pmppc/pmppc_locore.S
diff -u src/sys/arch/evbppc/pmppc/pmppc_locore.S:1.3 src/sys/arch/evbppc/pmppc/pmppc_locore.S:1.3.32.1
--- src/sys/arch/evbppc/pmppc/pmppc_locore.S:1.3 Tue Feb 5 22:31:49 2008
+++ src/sys/arch/evbppc/pmppc/pmppc_locore.S Fri Jan 7 01:43:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmppc_locore.S,v 1.3 2008/02/05 22:31:49 garbled Exp $ */
+/* $NetBSD: pmppc_locore.S,v 1.3.32.1 2011/01/07 01:43:08 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.6 src/sys/arch/evbppc/virtex/machdep.c:1.6.14.1
--- src/sys/arch/evbppc/virtex/machdep.c:1.6 Wed Jul 2 17:28:55 2008
+++ src/sys/arch/evbppc/virtex/machdep.c Fri Jan 7 01:43:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.6 2008/07/02 17:28:55 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.6.14.1 2011/01/07 01:43:08 matt Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.6 2008/07/02 17:28:55 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.6.14.1 2011/01/07 01:43:08 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -70,6 +70,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.1 src/sys/arch/evbppc/virtex/virtex_start.S:1.1.72.1
--- src/sys/arch/evbppc/virtex/virtex_start.S:1.1 Sat Dec 2 22:18:47 2006
+++ src/sys/arch/evbppc/virtex/virtex_start.S Fri Jan 7 01:43:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: virtex_start.S,v 1.1 2006/12/02 22:18:47 freza Exp $ */
+/* $NetBSD: virtex_start.S,v 1.1.72.1 2011/01/07 01:43:08 matt Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -53,6 +53,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.36 src/sys/arch/evbppc/walnut/machdep.c:1.36.14.1
--- src/sys/arch/evbppc/walnut/machdep.c:1.36 Wed Jul 2 17:28:55 2008
+++ src/sys/arch/evbppc/walnut/machdep.c Fri Jan 7 01:43:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.36 2008/07/02 17:28:55 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.36.14.1 2011/01/07 01:43:08 matt Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.36 2008/07/02 17:28:55 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.36.14.1 2011/01/07 01:43:08 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -102,6 +102,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.14 src/sys/arch/evbppc/walnut/walnut_start.S:1.14.74.1
--- src/sys/arch/evbppc/walnut/walnut_start.S:1.14 Mon Oct 16 18:14:35 2006
+++ src/sys/arch/evbppc/walnut/walnut_start.S Fri Jan 7 01:43:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: walnut_start.S,v 1.14 2006/10/16 18:14:35 kiyohara Exp $ */
+/* $NetBSD: walnut_start.S,v 1.14.74.1 2011/01/07 01:43:08 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -87,6 +87,7 @@
#include <machine/asm.h>
#include <powerpc/spr.h>
+#include <powerpc/ibm4xx/spr.h>
#include <powerpc/ibm4xx/dcr405gp.h>
#include <powerpc/ibm4xx/pmap.h>
