Module Name: src
Committed By: matt
Date: Fri Jan 7 01:36:12 UTC 2011
Modified Files:
src/sys/arch/amigappc/amigappc [matt-nb5-pq3]: locore.S
src/sys/arch/ibmnws/ibmnws [matt-nb5-pq3]: locore.S
src/sys/arch/macppc/dev [matt-nb5-pq3]: if_bm.c
src/sys/arch/macppc/macppc [matt-nb5-pq3]: cpu.c locore.S
src/sys/arch/ofppc/conf [matt-nb5-pq3]: GENERIC
src/sys/arch/ofppc/ofppc [matt-nb5-pq3]: cpu.c locore.S machdep.c
src/sys/arch/prep/prep [matt-nb5-pq3]: locore.S
src/sys/arch/prep/stand/boot [matt-nb5-pq3]: boot.c clock.c
src/sys/arch/rs6000/rs6000 [matt-nb5-pq3]: locore.S
src/sys/arch/rs6000/stand/boot [matt-nb5-pq3]: boot.c clock.c
Log Message:
Deal with split <spr.h> (and a few other misc fixes).
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.32.1 src/sys/arch/amigappc/amigappc/locore.S
cvs rdiff -u -r1.5 -r1.5.32.1 src/sys/arch/ibmnws/ibmnws/locore.S
cvs rdiff -u -r1.37 -r1.37.12.1 src/sys/arch/macppc/dev/if_bm.c
cvs rdiff -u -r1.48 -r1.48.40.1 src/sys/arch/macppc/macppc/cpu.c
cvs rdiff -u -r1.60 -r1.60.28.1 src/sys/arch/macppc/macppc/locore.S
cvs rdiff -u -r1.118 -r1.118.12.1 src/sys/arch/ofppc/conf/GENERIC
cvs rdiff -u -r1.11 -r1.11.24.1 src/sys/arch/ofppc/ofppc/cpu.c
cvs rdiff -u -r1.39 -r1.39.22.1 src/sys/arch/ofppc/ofppc/locore.S
cvs rdiff -u -r1.106 -r1.106.18.1 src/sys/arch/ofppc/ofppc/machdep.c
cvs rdiff -u -r1.10 -r1.10.28.1 src/sys/arch/prep/prep/locore.S
cvs rdiff -u -r1.15 -r1.15.86.1 src/sys/arch/prep/stand/boot/boot.c
cvs rdiff -u -r1.9 -r1.9.90.1 src/sys/arch/prep/stand/boot/clock.c
cvs rdiff -u -r1.2 -r1.2.28.1 src/sys/arch/rs6000/rs6000/locore.S
cvs rdiff -u -r1.2 -r1.2.40.1 src/sys/arch/rs6000/stand/boot/boot.c
cvs rdiff -u -r1.1 -r1.1.42.1 src/sys/arch/rs6000/stand/boot/clock.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/amigappc/amigappc/locore.S
diff -u src/sys/arch/amigappc/amigappc/locore.S:1.15 src/sys/arch/amigappc/amigappc/locore.S:1.15.32.1
--- src/sys/arch/amigappc/amigappc/locore.S:1.15 Tue Feb 5 22:31:48 2008
+++ src/sys/arch/amigappc/amigappc/locore.S Fri Jan 7 01:36:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.15 2008/02/05 22:31:48 garbled Exp $ */
+/* $NetBSD: locore.S,v 1.15.32.1 2011/01/07 01:36:12 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -60,6 +60,7 @@
#include <amiga/amiga/custom.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
.data
GLOBAL(proc0paddr)
Index: src/sys/arch/ibmnws/ibmnws/locore.S
diff -u src/sys/arch/ibmnws/ibmnws/locore.S:1.5 src/sys/arch/ibmnws/ibmnws/locore.S:1.5.32.1
--- src/sys/arch/ibmnws/ibmnws/locore.S:1.5 Tue Feb 5 22:31:49 2008
+++ src/sys/arch/ibmnws/ibmnws/locore.S Fri Jan 7 01:36:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.5 2008/02/05 22:31:49 garbled Exp $ */
+/* $NetBSD: locore.S,v 1.5.32.1 2011/01/07 01:36:10 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.37 src/sys/arch/macppc/dev/if_bm.c:1.37.12.1
--- src/sys/arch/macppc/dev/if_bm.c:1.37 Fri Sep 26 03:39:23 2008
+++ src/sys/arch/macppc/dev/if_bm.c Fri Jan 7 01:36:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bm.c,v 1.37 2008/09/26 03:39:23 macallan Exp $ */
+/* $NetBSD: if_bm.c,v 1.37.12.1 2011/01/07 01:36:12 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.37 2008/09/26 03:39:23 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bm.c,v 1.37.12.1 2011/01/07 01:36:12 matt Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -65,6 +65,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/cpu.c
diff -u src/sys/arch/macppc/macppc/cpu.c:1.48 src/sys/arch/macppc/macppc/cpu.c:1.48.40.1
--- src/sys/arch/macppc/macppc/cpu.c:1.48 Sat Nov 17 18:02:42 2007
+++ src/sys/arch/macppc/macppc/cpu.c Fri Jan 7 01:36:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.48 2007/11/17 18:02:42 macallan Exp $ */
+/* $NetBSD: cpu.c,v 1.48.40.1 2011/01/07 01:36:12 matt Exp $ */
/*-
* Copyright (c) 2001 Tsubai Masanari.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.48 2007/11/17 18:02:42 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.48.40.1 2011/01/07 01:36:12 matt Exp $");
#include "opt_ppcparam.h"
#include "opt_multiprocessor.h"
@@ -54,6 +54,7 @@
#include <powerpc/openpic.h>
#include <powerpc/atomic.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
#ifdef ALTIVEC
#include <powerpc/altivec.h>
#endif
Index: src/sys/arch/macppc/macppc/locore.S
diff -u src/sys/arch/macppc/macppc/locore.S:1.60 src/sys/arch/macppc/macppc/locore.S:1.60.28.1
--- src/sys/arch/macppc/macppc/locore.S:1.60 Tue Feb 5 18:14:02 2008
+++ src/sys/arch/macppc/macppc/locore.S Fri Jan 7 01:36:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.60 2008/02/05 18:14:02 garbled Exp $ */
+/* $NetBSD: locore.S,v 1.60.28.1 2011/01/07 01:36:12 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -52,6 +52,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/ofppc/conf/GENERIC
diff -u src/sys/arch/ofppc/conf/GENERIC:1.118 src/sys/arch/ofppc/conf/GENERIC:1.118.12.1
--- src/sys/arch/ofppc/conf/GENERIC:1.118 Sun Aug 10 15:31:21 2008
+++ src/sys/arch/ofppc/conf/GENERIC Fri Jan 7 01:36:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.118 2008/08/10 15:31:21 tls Exp $
+# $NetBSD: GENERIC,v 1.118.12.1 2011/01/07 01:36:11 matt Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.118 $"
+#ident "GENERIC-$Revision: 1.118.12.1 $"
maxusers 32
@@ -57,7 +57,8 @@
options DDB # in-kernel debugger
options DDB_HISTORY_SIZE=512 # enable history editing in DDB
options DDB_VERBOSE_HELP
-options TRAP_PANICWAIT
+##options TRAP_PANICWAIT
+##options SYSCALL_DEBUG
makeoptions DEBUG="-g" # compile full symbol table
Index: src/sys/arch/ofppc/ofppc/cpu.c
diff -u src/sys/arch/ofppc/ofppc/cpu.c:1.11 src/sys/arch/ofppc/ofppc/cpu.c:1.11.24.1
--- src/sys/arch/ofppc/ofppc/cpu.c:1.11 Mon Apr 28 20:23:31 2008
+++ src/sys/arch/ofppc/ofppc/cpu.c Fri Jan 7 01:36:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.11 2008/04/28 20:23:31 martin Exp $ */
+/* $NetBSD: cpu.c,v 1.11.24.1 2011/01/07 01:36:11 matt Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.11 2008/04/28 20:23:31 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.11.24.1 2011/01/07 01:36:11 matt Exp $");
#include "opt_ppcparam.h"
#include "opt_multiprocessor.h"
@@ -48,6 +48,7 @@
#include <powerpc/openpic.h>
#include <powerpc/atomic.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
#ifdef ALTIVEC
#include <powerpc/altivec.h>
#endif
Index: src/sys/arch/ofppc/ofppc/locore.S
diff -u src/sys/arch/ofppc/ofppc/locore.S:1.39 src/sys/arch/ofppc/ofppc/locore.S:1.39.22.1
--- src/sys/arch/ofppc/ofppc/locore.S:1.39 Tue Apr 8 02:33:03 2008
+++ src/sys/arch/ofppc/ofppc/locore.S Fri Jan 7 01:36:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.39 2008/04/08 02:33:03 garbled Exp $ */
+/* $NetBSD: locore.S,v 1.39.22.1 2011/01/07 01:36:11 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -49,6 +49,7 @@
#include <machine/vmparam.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
#include "ksyms.h"
@@ -121,7 +122,7 @@
/*
* Initialize cpu_info[0]
*/
- INIT_CPUINFO(4,1,9,0)
+ INIT_CPUINFO(4,1,9,5)
lis 3,__st...@ha
addi 3,3,__st...@l
Index: src/sys/arch/ofppc/ofppc/machdep.c
diff -u src/sys/arch/ofppc/ofppc/machdep.c:1.106 src/sys/arch/ofppc/ofppc/machdep.c:1.106.18.1
--- src/sys/arch/ofppc/ofppc/machdep.c:1.106 Mon Apr 28 20:23:31 2008
+++ src/sys/arch/ofppc/ofppc/machdep.c Fri Jan 7 01:36:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.106 2008/04/28 20:23:31 martin Exp $ */
+/* $NetBSD: machdep.c,v 1.106.18.1 2011/01/07 01:36:11 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.106 2008/04/28 20:23:31 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.106.18.1 2011/01/07 01:36:11 matt Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -49,6 +49,7 @@
#include <machine/bus.h>
#include <machine/isa_machdep.h>
#include <machine/spr.h>
+#include <powerpc/oea/spr.h>
#include <powerpc/oea/bat.h>
#include <powerpc/ofw_cons.h>
Index: src/sys/arch/prep/prep/locore.S
diff -u src/sys/arch/prep/prep/locore.S:1.10 src/sys/arch/prep/prep/locore.S:1.10.28.1
--- src/sys/arch/prep/prep/locore.S:1.10 Tue Feb 5 22:31:50 2008
+++ src/sys/arch/prep/prep/locore.S Fri Jan 7 01:36:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.10 2008/02/05 22:31:50 garbled Exp $ */
+/* $NetBSD: locore.S,v 1.10.28.1 2011/01/07 01:36:11 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 "ksyms.h"
Index: src/sys/arch/prep/stand/boot/boot.c
diff -u src/sys/arch/prep/stand/boot/boot.c:1.15 src/sys/arch/prep/stand/boot/boot.c:1.15.86.1
--- src/sys/arch/prep/stand/boot/boot.c:1.15 Sat Jun 10 07:49:29 2006
+++ src/sys/arch/prep/stand/boot/boot.c Fri Jan 7 01:36:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.15 2006/06/10 07:49:29 tsutsui Exp $ */
+/* $NetBSD: boot.c,v 1.15.86.1 2011/01/07 01:36:11 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -40,6 +40,7 @@
#include <machine/cpu.h>
#include <machine/residual.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
#include "boot.h"
Index: src/sys/arch/prep/stand/boot/clock.c
diff -u src/sys/arch/prep/stand/boot/clock.c:1.9 src/sys/arch/prep/stand/boot/clock.c:1.9.90.1
--- src/sys/arch/prep/stand/boot/clock.c:1.9 Mon Apr 10 18:40:06 2006
+++ src/sys/arch/prep/stand/boot/clock.c Fri Jan 7 01:36:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.9 2006/04/10 18:40:06 garbled Exp $ */
+/* $NetBSD: clock.c,v 1.9.90.1 2011/01/07 01:36:11 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -35,6 +35,7 @@
#include <dev/isa/isareg.h>
#include <dev/ic/i8253reg.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
#include "boot.h"
Index: src/sys/arch/rs6000/rs6000/locore.S
diff -u src/sys/arch/rs6000/rs6000/locore.S:1.2 src/sys/arch/rs6000/rs6000/locore.S:1.2.28.1
--- src/sys/arch/rs6000/rs6000/locore.S:1.2 Tue Feb 5 22:31:50 2008
+++ src/sys/arch/rs6000/rs6000/locore.S Fri Jan 7 01:36:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.2 2008/02/05 22:31:50 garbled Exp $ */
+/* $NetBSD: locore.S,v 1.2.28.1 2011/01/07 01:36:11 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 "ksyms.h"
Index: src/sys/arch/rs6000/stand/boot/boot.c
diff -u src/sys/arch/rs6000/stand/boot/boot.c:1.2 src/sys/arch/rs6000/stand/boot/boot.c:1.2.40.1
--- src/sys/arch/rs6000/stand/boot/boot.c:1.2 Mon Dec 17 19:54:32 2007
+++ src/sys/arch/rs6000/stand/boot/boot.c Fri Jan 7 01:36:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.2 2007/12/17 19:54:32 garbled Exp $ */
+/* $NetBSD: boot.c,v 1.2.40.1 2011/01/07 01:36:12 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -40,6 +40,7 @@
#include <machine/cpu.h>
#include <machine/iplcb.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
#include "boot.h"
Index: src/sys/arch/rs6000/stand/boot/clock.c
diff -u src/sys/arch/rs6000/stand/boot/clock.c:1.1 src/sys/arch/rs6000/stand/boot/clock.c:1.1.42.1
--- src/sys/arch/rs6000/stand/boot/clock.c:1.1 Mon Dec 17 19:09:46 2007
+++ src/sys/arch/rs6000/stand/boot/clock.c Fri Jan 7 01:36:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.1 2007/12/17 19:09:46 garbled Exp $ */
+/* $NetBSD: clock.c,v 1.1.42.1 2011/01/07 01:36:12 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -35,6 +35,7 @@
#include <dev/isa/isareg.h>
#include <dev/ic/i8253reg.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
#include "boot.h"
