[src/trunk]: src/sys/arch Adapt to <spr.h> breakup.

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8ceca530c708
branches:  trunk
changeset: 752436:8ceca530c708
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Feb 25 23:33:43 2010 +0000

description:
Adapt to <spr.h> breakup.

diffstat:

 sys/arch/amigappc/amigappc/locore.S      |   5 +++--
 sys/arch/bebox/bebox/locore.S            |   3 ++-
 sys/arch/evbppc/ev64260/ev64260_locore.S |   3 ++-
 sys/arch/evbppc/explora/explora_start.S  |   3 ++-
 sys/arch/evbppc/explora/machdep.c        |   5 +++--
 sys/arch/evbppc/obs405/obs200_locore.S   |   3 ++-
 sys/arch/evbppc/obs405/obs200_machdep.c  |   9 +++++----
 sys/arch/evbppc/obs405/obs266_machdep.c  |  10 +++++-----
 sys/arch/evbppc/pmppc/pmppc_locore.S     |   3 ++-
 sys/arch/evbppc/virtex/machdep.c         |   5 +++--
 sys/arch/evbppc/virtex/virtex_start.S    |   3 ++-
 sys/arch/evbppc/walnut/machdep.c         |   5 +++--
 sys/arch/evbppc/walnut/walnut_start.S    |   3 ++-
 sys/arch/ibmnws/ibmnws/locore.S          |   3 ++-
 sys/arch/macppc/dev/if_bm.c              |   5 +++--
 sys/arch/macppc/macppc/locore.S          |   4 +++-
 sys/arch/mvmeppc/mvmeppc/locore.S        |   3 ++-
 sys/arch/ofppc/ofppc/locore.S            |   3 ++-
 sys/arch/ofppc/ofppc/machdep.c           |   7 ++++---
 sys/arch/rs6000/rs6000/locore.S          |   3 ++-
 sys/arch/sandpoint/sandpoint/locore.S    |   3 ++-
 21 files changed, 56 insertions(+), 35 deletions(-)

diffs (truncated from 444 to 300 lines):

diff -r 758e1dbbf721 -r 8ceca530c708 sys/arch/amigappc/amigappc/locore.S
--- a/sys/arch/amigappc/amigappc/locore.S       Thu Feb 25 23:31:47 2010 +0000
+++ b/sys/arch/amigappc/amigappc/locore.S       Thu Feb 25 23:33:43 2010 +0000
@@ -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/spr.h>
+#include <powerpc/oea/spr.h>
 #include <powerpc/oea/hid.h>
-#include <powerpc/spr.h>
 #include <amiga/amiga/custom.h>
 #include <amigappc/amigappc/p5reg.h>
 
diff -r 758e1dbbf721 -r 8ceca530c708 sys/arch/bebox/bebox/locore.S
--- a/sys/arch/bebox/bebox/locore.S     Thu Feb 25 23:31:47 2010 +0000
+++ b/sys/arch/bebox/bebox/locore.S     Thu Feb 25 23:33:43 2010 +0000
@@ -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?)
diff -r 758e1dbbf721 -r 8ceca530c708 sys/arch/evbppc/ev64260/ev64260_locore.S
--- a/sys/arch/evbppc/ev64260/ev64260_locore.S  Thu Feb 25 23:31:47 2010 +0000
+++ b/sys/arch/evbppc/ev64260/ev64260_locore.S  Thu Feb 25 23:33:43 2010 +0000
@@ -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>
 
diff -r 758e1dbbf721 -r 8ceca530c708 sys/arch/evbppc/explora/explora_start.S
--- a/sys/arch/evbppc/explora/explora_start.S   Thu Feb 25 23:31:47 2010 +0000
+++ b/sys/arch/evbppc/explora/explora_start.S   Thu Feb 25 23:33:43 2010 +0000
@@ -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>
 
diff -r 758e1dbbf721 -r 8ceca530c708 sys/arch/evbppc/explora/machdep.c
--- a/sys/arch/evbppc/explora/machdep.c Thu Feb 25 23:31:47 2010 +0000
+++ b/sys/arch/evbppc/explora/machdep.c Thu Feb 25 23:33:43 2010 +0000
@@ -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)
diff -r 758e1dbbf721 -r 8ceca530c708 sys/arch/evbppc/obs405/obs200_locore.S
--- a/sys/arch/evbppc/obs405/obs200_locore.S    Thu Feb 25 23:31:47 2010 +0000
+++ b/sys/arch/evbppc/obs405/obs200_locore.S    Thu Feb 25 23:33:43 2010 +0000
@@ -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>
 
diff -r 758e1dbbf721 -r 8ceca530c708 sys/arch/evbppc/obs405/obs200_machdep.c
--- a/sys/arch/evbppc/obs405/obs200_machdep.c   Thu Feb 25 23:31:47 2010 +0000
+++ b/sys/arch/evbppc/obs405/obs200_machdep.c   Thu Feb 25 23:33:43 2010 +0000
@@ -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"
 
 
diff -r 758e1dbbf721 -r 8ceca530c708 sys/arch/evbppc/obs405/obs266_machdep.c
--- a/sys/arch/evbppc/obs405/obs266_machdep.c   Thu Feb 25 23:31:47 2010 +0000
+++ b/sys/arch/evbppc/obs405/obs266_machdep.c   Thu Feb 25 23:33:43 2010 +0000
@@ -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"
 
 
diff -r 758e1dbbf721 -r 8ceca530c708 sys/arch/evbppc/pmppc/pmppc_locore.S
--- a/sys/arch/evbppc/pmppc/pmppc_locore.S      Thu Feb 25 23:31:47 2010 +0000
+++ b/sys/arch/evbppc/pmppc/pmppc_locore.S      Thu Feb 25 23:33:43 2010 +0000
@@ -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"
diff -r 758e1dbbf721 -r 8ceca530c708 sys/arch/evbppc/virtex/machdep.c
--- a/sys/arch/evbppc/virtex/machdep.c  Thu Feb 25 23:31:47 2010 +0000
+++ b/sys/arch/evbppc/virtex/machdep.c  Thu Feb 25 23:33:43 2010 +0000
@@ -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>
diff -r 758e1dbbf721 -r 8ceca530c708 sys/arch/evbppc/virtex/virtex_start.S
--- a/sys/arch/evbppc/virtex/virtex_start.S     Thu Feb 25 23:31:47 2010 +0000
+++ b/sys/arch/evbppc/virtex/virtex_start.S     Thu Feb 25 23:33:43 2010 +0000
@@ -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>
 
diff -r 758e1dbbf721 -r 8ceca530c708 sys/arch/evbppc/walnut/machdep.c
--- a/sys/arch/evbppc/walnut/machdep.c  Thu Feb 25 23:31:47 2010 +0000
+++ b/sys/arch/evbppc/walnut/machdep.c  Thu Feb 25 23:33:43 2010 +0000
@@ -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>
diff -r 758e1dbbf721 -r 8ceca530c708 sys/arch/evbppc/walnut/walnut_start.S
--- a/sys/arch/evbppc/walnut/walnut_start.S     Thu Feb 25 23:31:47 2010 +0000
+++ b/sys/arch/evbppc/walnut/walnut_start.S     Thu Feb 25 23:33:43 2010 +0000
@@ -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>
 
diff -r 758e1dbbf721 -r 8ceca530c708 sys/arch/ibmnws/ibmnws/locore.S
--- a/sys/arch/ibmnws/ibmnws/locore.S   Thu Feb 25 23:31:47 2010 +0000
+++ b/sys/arch/ibmnws/ibmnws/locore.S   Thu Feb 25 23:33:43 2010 +0000
@@ -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>