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

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

details:   https://anonhg.NetBSD.org/src/rev/758e1dbbf721
branches:  trunk
changeset: 752435:758e1dbbf721
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Feb 25 23:31:47 2010 +0000

description:
Adapt to spr.h breakup.

diffstat:

 sys/arch/powerpc/ibm4xx/clock.c           |   5 +++--
 sys/arch/powerpc/ibm4xx/dev/opb.c         |   5 +++--
 sys/arch/powerpc/ibm4xx/dev/wdog.c        |   5 +++--
 sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c  |   5 +++--
 sys/arch/powerpc/ibm4xx/intr.c            |   5 +++--
 sys/arch/powerpc/ibm4xx/openbios/locore.S |   5 +++--
 sys/arch/powerpc/ibm4xx/pmap.c            |   5 +++--
 sys/arch/powerpc/ibm4xx/trap.c            |   5 +++--
 sys/arch/powerpc/include/cpu_counter.h    |  12 +++++++++---
 sys/arch/powerpc/oea/altivec.c            |   7 ++++---
 sys/arch/powerpc/oea/cpu_subr.c           |   7 ++++---
 sys/arch/powerpc/oea/oea_machdep.c        |  12 +++++++-----
 sys/arch/powerpc/oea/pmap.c               |   7 ++++---
 sys/arch/powerpc/powerpc/bus_space.c      |  11 ++++++-----
 sys/arch/powerpc/powerpc/clock.c          |  13 +++++++++++--
 sys/arch/powerpc/powerpc/db_interface.c   |  13 +++++++++++--
 sys/arch/powerpc/powerpc/db_trace.c       |  13 +++++++++++--
 sys/arch/powerpc/powerpc/trap.c           |   8 +++++---
 18 files changed, 96 insertions(+), 47 deletions(-)

diffs (truncated from 532 to 300 lines):

diff -r 65cf2052c228 -r 758e1dbbf721 sys/arch/powerpc/ibm4xx/clock.c
--- a/sys/arch/powerpc/ibm4xx/clock.c   Thu Feb 25 23:30:04 2010 +0000
+++ b/sys/arch/powerpc/ibm4xx/clock.c   Thu Feb 25 23:31:47 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.21 2008/01/09 06:50:36 simonb Exp $        */
+/*     $NetBSD: clock.c,v 1.22 2010/02/25 23:31:47 matt Exp $  */
 /*      $OpenBSD: clock.c,v 1.3 1997/10/13 13:42:53 pefo Exp $  */
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.21 2008/01/09 06:50:36 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.22 2010/02/25 23:31:47 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -47,6 +47,7 @@
 #include <machine/cpu.h>
 
 #include <powerpc/spr.h>
+#include <powerpc/ibm4xx/spr.h>
 
 /*
  * Initially we assume a processor with a bus frequency of 12.5 MHz.
diff -r 65cf2052c228 -r 758e1dbbf721 sys/arch/powerpc/ibm4xx/dev/opb.c
--- a/sys/arch/powerpc/ibm4xx/dev/opb.c Thu Feb 25 23:30:04 2010 +0000
+++ b/sys/arch/powerpc/ibm4xx/dev/opb.c Thu Feb 25 23:31:47 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: opb.c,v 1.23 2006/03/13 15:31:11 shige Exp $ */
+/* $NetBSD: opb.c,v 1.24 2010/02/25 23:31:47 matt Exp $ */
 
 /*
  * Copyright 2001,2002 Wasabi Systems, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opb.c,v 1.23 2006/03/13 15:31:11 shige Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opb.c,v 1.24 2010/02/25 23:31:47 matt Exp $");
 
 #include "locators.h"
 
@@ -76,6 +76,7 @@
 #include <sys/extent.h>
 
 #include <powerpc/spr.h>
+#include <powerpc/ibm4xx/spr.h>
 #include <powerpc/ibm4xx/dev/opbvar.h>
 #include <powerpc/ibm4xx/dev/plbvar.h>
 #include <powerpc/ibm4xx/ibm405gp.h>
diff -r 65cf2052c228 -r 758e1dbbf721 sys/arch/powerpc/ibm4xx/dev/wdog.c
--- a/sys/arch/powerpc/ibm4xx/dev/wdog.c        Thu Feb 25 23:30:04 2010 +0000
+++ b/sys/arch/powerpc/ibm4xx/dev/wdog.c        Thu Feb 25 23:31:47 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wdog.c,v 1.9 2006/05/05 18:04:42 thorpej Exp $ */
+/* $NetBSD: wdog.c,v 1.10 2010/02/25 23:31:47 matt Exp $ */
 
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdog.c,v 1.9 2006/05/05 18:04:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdog.c,v 1.10 2010/02/25 23:31:47 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -50,6 +50,7 @@
 #include <prop/proplib.h>
 
 #include <powerpc/spr.h>
+#include <powerpc/ibm4xx/spr.h>
 #include <powerpc/ibm4xx/dev/opbvar.h>
 
 #include <dev/sysmon/sysmonvar.h>
diff -r 65cf2052c228 -r 758e1dbbf721 sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c
--- a/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c  Thu Feb 25 23:30:04 2010 +0000
+++ b/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c  Thu Feb 25 23:31:47 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ibm4xx_machdep.c,v 1.12 2009/11/27 03:23:12 rmind Exp $        */
+/*     $NetBSD: ibm4xx_machdep.c,v 1.13 2010/02/25 23:31:47 matt Exp $ */
 /*     Original: ibm40x_machdep.c,v 1.3 2005/01/17 17:19:36 shige Exp $ */
 
 /*
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.12 2009/11/27 03:23:12 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.13 2010/02/25 23:31:47 matt Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
@@ -96,6 +96,7 @@
 
 #include <machine/powerpc.h>
 #include <powerpc/spr.h>
+#include <powerpc/ibm4xx/spr.h>
 #include <machine/trap.h>
 
 /*
diff -r 65cf2052c228 -r 758e1dbbf721 sys/arch/powerpc/ibm4xx/intr.c
--- a/sys/arch/powerpc/ibm4xx/intr.c    Thu Feb 25 23:30:04 2010 +0000
+++ b/sys/arch/powerpc/ibm4xx/intr.c    Thu Feb 25 23:31:47 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.c,v 1.21 2009/01/04 15:34:18 tsutsui Exp $        */
+/*     $NetBSD: intr.c,v 1.22 2010/02/25 23:31:47 matt Exp $   */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.21 2009/01/04 15:34:18 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.22 2010/02/25 23:31:47 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -50,6 +50,7 @@
 
 #include <powerpc/cpu.h>
 #include <powerpc/spr.h>
+#include <powerpc/ibm4xx/spr.h>
 
 
 /*
diff -r 65cf2052c228 -r 758e1dbbf721 sys/arch/powerpc/ibm4xx/openbios/locore.S
--- a/sys/arch/powerpc/ibm4xx/openbios/locore.S Thu Feb 25 23:30:04 2010 +0000
+++ b/sys/arch/powerpc/ibm4xx/openbios/locore.S Thu Feb 25 23:31:47 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.6 2009/11/26 00:19:20 matt Exp $  */
+/*     $NetBSD: locore.S,v 1.7 2010/02/25 23:31:47 matt Exp $  */
 /*     $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $       */
 
 /*
@@ -88,8 +88,9 @@
 #include <machine/asm.h>
 
 #include <powerpc/spr.h>
+#include <powerpc/ibm4xx/spr.h>
+#include <powerpc/ibm4xx/pmap.h>
 #include <powerpc/ibm4xx/dcr405gp.h>
-#include <powerpc/ibm4xx/pmap.h>
 
 /* Function pointer for requesting board_config_data from openbios*/
 #define BOARD_CFG_FP       0xFFFE0B50
diff -r 65cf2052c228 -r 758e1dbbf721 sys/arch/powerpc/ibm4xx/pmap.c
--- a/sys/arch/powerpc/ibm4xx/pmap.c    Thu Feb 25 23:30:04 2010 +0000
+++ b/sys/arch/powerpc/ibm4xx/pmap.c    Thu Feb 25 23:31:47 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.61 2010/02/25 07:21:19 skrll Exp $  */
+/*     $NetBSD: pmap.c,v 1.62 2010/02/25 23:31:47 matt Exp $   */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.61 2010/02/25 07:21:19 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.62 2010/02/25 23:31:47 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -84,6 +84,7 @@
 #include <machine/powerpc.h>
 
 #include <powerpc/spr.h>
+#include <powerpc/ibm4xx/spr.h>
 #include <machine/tlb.h>
 
 /*
diff -r 65cf2052c228 -r 758e1dbbf721 sys/arch/powerpc/ibm4xx/trap.c
--- a/sys/arch/powerpc/ibm4xx/trap.c    Thu Feb 25 23:30:04 2010 +0000
+++ b/sys/arch/powerpc/ibm4xx/trap.c    Thu Feb 25 23:31:47 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.53 2009/11/21 17:40:29 rmind Exp $  */
+/*     $NetBSD: trap.c,v 1.54 2010/02/25 23:31:47 matt Exp $   */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.53 2009/11/21 17:40:29 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.54 2010/02/25 23:31:47 matt Exp $");
 
 #include "opt_altivec.h"
 #include "opt_ddb.h"
@@ -101,6 +101,7 @@
 #include <machine/trap.h>
 
 #include <powerpc/spr.h>
+#include <powerpc/ibm4xx/spr.h>
 #include <powerpc/ibm4xx/pmap.h>
 #include <powerpc/ibm4xx/tlb.h>
 #include <powerpc/fpu/fpu_extern.h>
diff -r 65cf2052c228 -r 758e1dbbf721 sys/arch/powerpc/include/cpu_counter.h
--- a/sys/arch/powerpc/include/cpu_counter.h    Thu Feb 25 23:30:04 2010 +0000
+++ b/sys/arch/powerpc/include/cpu_counter.h    Thu Feb 25 23:31:47 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu_counter.h,v 1.6 2008/02/05 22:31:49 garbled Exp $  */
+/*     $NetBSD: cpu_counter.h,v 1.7 2010/02/25 23:31:47 matt Exp $     */
 
 /*-
  * Copyright (c) 2000 Tsubai Masanari.  All rights reserved.
@@ -36,6 +36,9 @@
 #ifdef _KERNEL
 
 #include <powerpc/spr.h>
+#ifdef PPC_OEA601
+#include <powerpc/oea/spr.h>
+#endif
 
 #define cpu_hascounter()       (1)
 #define cpu_counter()          cpu_counter32()
@@ -67,8 +70,11 @@
            "mftb       %1              \n"
 #endif
            "2:                         \n"
-           : "=r"(scratch), "=r"(rv), "=r"(rtcu)
-           : "n"(MPC601), "n"(SPR_RTCU_R), "n"(SPR_RTCL_R));
+               : "=r"(scratch), "=r"(rv), "=r"(rtcu)
+#ifdef PPC_OEA601
+               : "n"(MPC601), "n"(SPR_RTCU_R), "n"(SPR_RTCL_R)
+#endif
+           );
 
        return rv;
 }
diff -r 65cf2052c228 -r 758e1dbbf721 sys/arch/powerpc/oea/altivec.c
--- a/sys/arch/powerpc/oea/altivec.c    Thu Feb 25 23:30:04 2010 +0000
+++ b/sys/arch/powerpc/oea/altivec.c    Thu Feb 25 23:31:47 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: altivec.c,v 1.15 2009/11/21 17:40:29 rmind Exp $       */
+/*     $NetBSD: altivec.c,v 1.16 2010/02/25 23:31:47 matt Exp $        */
 
 /*
  * Copyright (C) 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altivec.c,v 1.15 2009/11/21 17:40:29 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altivec.c,v 1.16 2010/02/25 23:31:47 matt Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -45,8 +45,9 @@
 #include <uvm/uvm_extern.h>
 
 #include <powerpc/altivec.h>
+#include <powerpc/psl.h>
 #include <powerpc/spr.h>
-#include <powerpc/psl.h>
+#include <powerpc/oea/spr.h>
 
 #ifdef MULTIPROCESSOR
 #include <arch/powerpc/pic/picvar.h>
diff -r 65cf2052c228 -r 758e1dbbf721 sys/arch/powerpc/oea/cpu_subr.c
--- a/sys/arch/powerpc/oea/cpu_subr.c   Thu Feb 25 23:30:04 2010 +0000
+++ b/sys/arch/powerpc/oea/cpu_subr.c   Thu Feb 25 23:31:47 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu_subr.c,v 1.54 2009/11/21 17:40:29 rmind Exp $      */
+/*     $NetBSD: cpu_subr.c,v 1.55 2010/02/25 23:31:47 matt Exp $       */
 
 /*-
  * Copyright (c) 2001 Matt Thomas.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.54 2009/11/21 17:40:29 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.55 2010/02/25 23:31:47 matt Exp $");
 
 #include "opt_ppcparam.h"
 #include "opt_multiprocessor.h"
@@ -50,9 +50,10 @@
 
 #include <uvm/uvm_extern.h>
 
+#include <powerpc/spr.h>
 #include <powerpc/oea/hid.h>
 #include <powerpc/oea/hid_601.h>
-#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
 #include <powerpc/oea/cpufeat.h>
 
 #include <dev/sysmon/sysmonvar.h>
diff -r 65cf2052c228 -r 758e1dbbf721 sys/arch/powerpc/oea/oea_machdep.c
--- a/sys/arch/powerpc/oea/oea_machdep.c        Thu Feb 25 23:30:04 2010 +0000
+++ b/sys/arch/powerpc/oea/oea_machdep.c        Thu Feb 25 23:31:47 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: oea_machdep.c,v 1.52 2010/02/08 19:02:31 joerg Exp $   */
+/*     $NetBSD: oea_machdep.c,v 1.53 2010/02/25 23:31:47 matt Exp $    */