Module Name: src
Committed By: matt
Date: Thu Feb 25 23:31:48 UTC 2010
Modified Files:
src/sys/arch/powerpc/ibm4xx: clock.c ibm4xx_machdep.c intr.c pmap.c
trap.c
src/sys/arch/powerpc/ibm4xx/dev: opb.c wdog.c
src/sys/arch/powerpc/ibm4xx/openbios: locore.S
src/sys/arch/powerpc/include: cpu_counter.h
src/sys/arch/powerpc/oea: altivec.c cpu_subr.c oea_machdep.c pmap.c
src/sys/arch/powerpc/powerpc: bus_space.c clock.c db_interface.c
db_trace.c trap.c
Log Message:
Adapt to spr.h breakup.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/ibm4xx/clock.c \
src/sys/arch/powerpc/ibm4xx/intr.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/powerpc/ibm4xx/pmap.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/powerpc/ibm4xx/trap.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/powerpc/ibm4xx/dev/opb.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/powerpc/ibm4xx/dev/wdog.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/ibm4xx/openbios/locore.S
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/include/cpu_counter.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/oea/altivec.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/powerpc/oea/cpu_subr.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/powerpc/oea/oea_machdep.c
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/powerpc/oea/pmap.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/powerpc/powerpc/bus_space.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/powerpc/clock.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/powerpc/powerpc/db_interface.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/powerpc/powerpc/db_trace.c
cvs rdiff -u -r1.132 -r1.133 src/sys/arch/powerpc/powerpc/trap.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/powerpc/ibm4xx/clock.c
diff -u src/sys/arch/powerpc/ibm4xx/clock.c:1.21 src/sys/arch/powerpc/ibm4xx/clock.c:1.22
--- src/sys/arch/powerpc/ibm4xx/clock.c:1.21 Wed Jan 9 06:50:36 2008
+++ src/sys/arch/powerpc/ibm4xx/clock.c Thu Feb 25 23:31:47 2010
@@ -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.
Index: src/sys/arch/powerpc/ibm4xx/intr.c
diff -u src/sys/arch/powerpc/ibm4xx/intr.c:1.21 src/sys/arch/powerpc/ibm4xx/intr.c:1.22
--- src/sys/arch/powerpc/ibm4xx/intr.c:1.21 Sun Jan 4 15:34:18 2009
+++ src/sys/arch/powerpc/ibm4xx/intr.c Thu Feb 25 23:31:47 2010
@@ -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>
/*
Index: src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c
diff -u src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.12 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.13
--- src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.12 Fri Nov 27 03:23:12 2009
+++ src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c Thu Feb 25 23:31:47 2010
@@ -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>
/*
Index: src/sys/arch/powerpc/ibm4xx/pmap.c
diff -u src/sys/arch/powerpc/ibm4xx/pmap.c:1.61 src/sys/arch/powerpc/ibm4xx/pmap.c:1.62
--- src/sys/arch/powerpc/ibm4xx/pmap.c:1.61 Thu Feb 25 07:21:19 2010
+++ src/sys/arch/powerpc/ibm4xx/pmap.c Thu Feb 25 23:31:47 2010
@@ -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>
/*
Index: src/sys/arch/powerpc/ibm4xx/trap.c
diff -u src/sys/arch/powerpc/ibm4xx/trap.c:1.53 src/sys/arch/powerpc/ibm4xx/trap.c:1.54
--- src/sys/arch/powerpc/ibm4xx/trap.c:1.53 Sat Nov 21 17:40:29 2009
+++ src/sys/arch/powerpc/ibm4xx/trap.c Thu Feb 25 23:31:47 2010
@@ -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>
Index: src/sys/arch/powerpc/ibm4xx/dev/opb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/opb.c:1.23 src/sys/arch/powerpc/ibm4xx/dev/opb.c:1.24
--- src/sys/arch/powerpc/ibm4xx/dev/opb.c:1.23 Mon Mar 13 15:31:11 2006
+++ src/sys/arch/powerpc/ibm4xx/dev/opb.c Thu Feb 25 23:31:47 2010
@@ -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>
Index: src/sys/arch/powerpc/ibm4xx/dev/wdog.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/wdog.c:1.9 src/sys/arch/powerpc/ibm4xx/dev/wdog.c:1.10
--- src/sys/arch/powerpc/ibm4xx/dev/wdog.c:1.9 Fri May 5 18:04:42 2006
+++ src/sys/arch/powerpc/ibm4xx/dev/wdog.c Thu Feb 25 23:31:47 2010
@@ -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>
Index: src/sys/arch/powerpc/ibm4xx/openbios/locore.S
diff -u src/sys/arch/powerpc/ibm4xx/openbios/locore.S:1.6 src/sys/arch/powerpc/ibm4xx/openbios/locore.S:1.7
--- src/sys/arch/powerpc/ibm4xx/openbios/locore.S:1.6 Thu Nov 26 00:19:20 2009
+++ src/sys/arch/powerpc/ibm4xx/openbios/locore.S Thu Feb 25 23:31:47 2010
@@ -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/dcr405gp.h>
+#include <powerpc/ibm4xx/spr.h>
#include <powerpc/ibm4xx/pmap.h>
+#include <powerpc/ibm4xx/dcr405gp.h>
/* Function pointer for requesting board_config_data from openbios*/
#define BOARD_CFG_FP 0xFFFE0B50
Index: src/sys/arch/powerpc/include/cpu_counter.h
diff -u src/sys/arch/powerpc/include/cpu_counter.h:1.6 src/sys/arch/powerpc/include/cpu_counter.h:1.7
--- src/sys/arch/powerpc/include/cpu_counter.h:1.6 Tue Feb 5 22:31:49 2008
+++ src/sys/arch/powerpc/include/cpu_counter.h Thu Feb 25 23:31:47 2010
@@ -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;
}
Index: src/sys/arch/powerpc/oea/altivec.c
diff -u src/sys/arch/powerpc/oea/altivec.c:1.15 src/sys/arch/powerpc/oea/altivec.c:1.16
--- src/sys/arch/powerpc/oea/altivec.c:1.15 Sat Nov 21 17:40:29 2009
+++ src/sys/arch/powerpc/oea/altivec.c Thu Feb 25 23:31:47 2010
@@ -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/spr.h>
#include <powerpc/psl.h>
+#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
#ifdef MULTIPROCESSOR
#include <arch/powerpc/pic/picvar.h>
Index: src/sys/arch/powerpc/oea/cpu_subr.c
diff -u src/sys/arch/powerpc/oea/cpu_subr.c:1.54 src/sys/arch/powerpc/oea/cpu_subr.c:1.55
--- src/sys/arch/powerpc/oea/cpu_subr.c:1.54 Sat Nov 21 17:40:29 2009
+++ src/sys/arch/powerpc/oea/cpu_subr.c Thu Feb 25 23:31:47 2010
@@ -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>
Index: src/sys/arch/powerpc/oea/oea_machdep.c
diff -u src/sys/arch/powerpc/oea/oea_machdep.c:1.52 src/sys/arch/powerpc/oea/oea_machdep.c:1.53
--- src/sys/arch/powerpc/oea/oea_machdep.c:1.52 Mon Feb 8 19:02:31 2010
+++ src/sys/arch/powerpc/oea/oea_machdep.c Thu Feb 25 23:31:47 2010
@@ -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 $ */
/*
* Copyright (C) 2002 Matt Thomas
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.52 2010/02/08 19:02:31 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.53 2010/02/25 23:31:47 matt Exp $");
#include "opt_ppcarch.h"
#include "opt_compat_netbsd.h"
@@ -75,9 +75,6 @@
#include <ipkdb/ipkdb.h>
#endif
-#include <powerpc/oea/bat.h>
-#include <powerpc/oea/sr_601.h>
-#include <powerpc/oea/cpufeat.h>
#include <powerpc/trap.h>
#include <powerpc/stdarg.h>
#include <powerpc/spr.h>
@@ -85,6 +82,11 @@
#include <powerpc/altivec.h>
#include <machine/powerpc.h>
+#include <powerpc/oea/spr.h>
+#include <powerpc/oea/bat.h>
+#include <powerpc/oea/sr_601.h>
+#include <powerpc/oea/cpufeat.h>
+
char machine[] = MACHINE; /* from <machine/param.h> */
char machine_arch[] = MACHINE_ARCH; /* from <machine/param.h> */
Index: src/sys/arch/powerpc/oea/pmap.c
diff -u src/sys/arch/powerpc/oea/pmap.c:1.70 src/sys/arch/powerpc/oea/pmap.c:1.71
--- src/sys/arch/powerpc/oea/pmap.c:1.70 Thu Feb 25 07:21:19 2010
+++ src/sys/arch/powerpc/oea/pmap.c Thu Feb 25 23:31:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.70 2010/02/25 07:21:19 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.71 2010/02/25 23:31:47 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.70 2010/02/25 07:21:19 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.71 2010/02/25 23:31:47 matt Exp $");
#define PMAP_NOOPNAMES
@@ -86,9 +86,10 @@
#include <machine/pcb.h>
#include <machine/powerpc.h>
#include <powerpc/spr.h>
-#include <powerpc/oea/sr_601.h>
#include <powerpc/bat.h>
#include <powerpc/stdarg.h>
+#include <powerpc/oea/spr.h>
+#include <powerpc/oea/sr_601.h>
#ifdef ALTIVEC
int pmap_use_altivec;
Index: src/sys/arch/powerpc/powerpc/bus_space.c
diff -u src/sys/arch/powerpc/powerpc/bus_space.c:1.20 src/sys/arch/powerpc/powerpc/bus_space.c:1.21
--- src/sys/arch/powerpc/powerpc/bus_space.c:1.20 Mon Apr 28 20:23:32 2008
+++ src/sys/arch/powerpc/powerpc/bus_space.c Thu Feb 25 23:31:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.20 2008/04/28 20:23:32 martin Exp $ */
+/* $NetBSD: bus_space.c,v 1.21 2010/02/25 23:31:48 matt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.20 2008/04/28 20:23:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.21 2010/02/25 23:31:48 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,12 +46,13 @@
#define _POWERPC_BUS_SPACE_PRIVATE
#include <machine/bus.h>
-#if !defined (PPC_IBM4XX)
+#if defined (PPC_OEA) || defined(PPC_OEA64) || defined (PPC_OEA64_BRIDGE)
+#include <powerpc/spr.h>
#include <powerpc/oea/bat.h>
+#include <powerpc/oea/cpufeat.h>
#include <powerpc/oea/pte.h>
+#include <powerpc/oea/spr.h>
#include <powerpc/oea/sr_601.h>
-#include <powerpc/oea/cpufeat.h>
-#include <powerpc/spr.h>
extern unsigned long oeacpufeat;
#endif
Index: src/sys/arch/powerpc/powerpc/clock.c
diff -u src/sys/arch/powerpc/powerpc/clock.c:1.6 src/sys/arch/powerpc/powerpc/clock.c:1.7
--- src/sys/arch/powerpc/powerpc/clock.c:1.6 Tue Feb 5 22:31:50 2008
+++ src/sys/arch/powerpc/powerpc/clock.c Thu Feb 25 23:31:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.6 2008/02/05 22:31:50 garbled Exp $ */
+/* $NetBSD: clock.c,v 1.7 2010/02/25 23:31:48 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.6 2008/02/05 22:31:50 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.7 2010/02/25 23:31:48 matt Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -44,6 +44,15 @@
#include <uvm/uvm_extern.h>
#include <powerpc/spr.h>
+#if defined (PPC_OEA) || defined(PPC_OEA64) || defined (PPC_OEA64_BRIDGE)
+#include <powerpc/oea/spr.h>
+#elif defined (PPC_BOOKE)
+#include <powerpc/booke/spr.h>
+#elif defined (PPC_IBM4XX)
+#include <powerpc/ibm4xx/spr.h>
+#else
+#error unknown powerpc variant
+#endif
void decr_intr(struct clockframe *);
void init_powerpc_tc(void);
Index: src/sys/arch/powerpc/powerpc/db_interface.c
diff -u src/sys/arch/powerpc/powerpc/db_interface.c:1.43 src/sys/arch/powerpc/powerpc/db_interface.c:1.44
--- src/sys/arch/powerpc/powerpc/db_interface.c:1.43 Thu Jan 28 21:10:49 2010
+++ src/sys/arch/powerpc/powerpc/db_interface.c Thu Feb 25 23:31:48 2010
@@ -1,8 +1,8 @@
-/* $NetBSD: db_interface.c,v 1.43 2010/01/28 21:10:49 phx Exp $ */
+/* $NetBSD: db_interface.c,v 1.44 2010/02/25 23:31:48 matt Exp $ */
/* $OpenBSD: db_interface.c,v 1.2 1996/12/28 06:21:50 rahnds Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.43 2010/01/28 21:10:49 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.44 2010/02/25 23:31:48 matt Exp $");
#define USERACC
@@ -23,11 +23,20 @@
#include <powerpc/bat.h>
#include <powerpc/pte.h>
+#if defined (PPC_OEA) || defined(PPC_OEA64) || defined (PPC_OEA64_BRIDGE)
+#include <powerpc/oea/spr.h>
+#endif
+
#ifdef PPC_IBM4XX
+#include <powerpc/ibm4xx/spr.h>
#include <machine/tlb.h>
#include <uvm/uvm_extern.h>
#endif
+#ifdef PPC_BOOKE
+#include <powerpc/booke/spr.h>
+#endif
+
#ifdef DDB
#include <ddb/db_sym.h>
#include <ddb/db_command.h>
Index: src/sys/arch/powerpc/powerpc/db_trace.c
diff -u src/sys/arch/powerpc/powerpc/db_trace.c:1.50 src/sys/arch/powerpc/powerpc/db_trace.c:1.51
--- src/sys/arch/powerpc/powerpc/db_trace.c:1.50 Sat Nov 21 17:40:29 2009
+++ src/sys/arch/powerpc/powerpc/db_trace.c Thu Feb 25 23:31:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.50 2009/11/21 17:40:29 rmind Exp $ */
+/* $NetBSD: db_trace.c,v 1.51 2010/02/25 23:31:48 matt Exp $ */
/* $OpenBSD: db_trace.c,v 1.3 1997/03/21 02:10:48 niklas Exp $ */
/*
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.50 2009/11/21 17:40:29 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.51 2010/02/25 23:31:48 matt Exp $");
#include "opt_ppcarch.h"
@@ -41,6 +41,15 @@
#include <machine/db_machdep.h>
#include <machine/pmap.h>
#include <powerpc/spr.h>
+#if defined (PPC_OEA) || defined(PPC_OEA64) || defined (PPC_OEA64_BRIDGE)
+#include <powerpc/oea/spr.h>
+#elif defined(PPC_IBM4XX)
+#include <powerpc/ibm4xx/spr.h>
+#elif defined(PPC_BOOKE)
+#include <powerpc/booke/spr.h>
+#else
+#include unknown powerpc variants
+#endif
#include <ddb/db_access.h>
#include <ddb/db_interface.h>
Index: src/sys/arch/powerpc/powerpc/trap.c
diff -u src/sys/arch/powerpc/powerpc/trap.c:1.132 src/sys/arch/powerpc/powerpc/trap.c:1.133
--- src/sys/arch/powerpc/powerpc/trap.c:1.132 Tue Jan 5 13:20:29 2010
+++ src/sys/arch/powerpc/powerpc/trap.c Thu Feb 25 23:31:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.132 2010/01/05 13:20:29 mbalmer Exp $ */
+/* $NetBSD: trap.c,v 1.133 2010/02/25 23:31:48 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.132 2010/01/05 13:20:29 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.133 2010/02/25 23:31:48 matt Exp $");
#include "opt_altivec.h"
#include "opt_ddb.h"
@@ -61,9 +61,11 @@
#include <machine/psl.h>
#include <machine/trap.h>
#include <powerpc/altivec.h>
-#include <powerpc/spr.h>
#include <powerpc/userret.h>
+#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
+
static int emulated_opcode(struct lwp *, struct trapframe *);
static int fix_unaligned(struct lwp *, struct trapframe *);
static inline vaddr_t setusr(vaddr_t, size_t *);
