Module Name: src
Committed By: matt
Date: Tue Mar 2 21:52:33 UTC 2010
Modified Files:
src/sys/arch/macppc/macppc: cpu.c
src/sys/arch/mvmeppc/stand/libsa: srt0.S
src/sys/arch/ofppc/ofppc: cpu.c
src/sys/arch/powerpc/include: Makefile
src/sys/arch/prep/prep: locore.S
src/sys/arch/prep/stand/boot: boot.c clock.c
src/sys/arch/rs6000/stand/boot: boot.c clock.c
src/sys/arch/sandpoint/stand/netboot: entry.S
Removed Files:
src/sys/arch/amigappc/include: spr.h
src/sys/arch/bebox/include: spr.h
src/sys/arch/evbppc/include: spr.h
src/sys/arch/ibmnws/include: spr.h
src/sys/arch/macppc/include: spr.h
src/sys/arch/mvmeppc/include: spr.h
src/sys/arch/ofppc/include: spr.h
src/sys/arch/prep/include: spr.h
src/sys/arch/rs6000/include: spr.h
src/sys/arch/sandpoint/include: spr.h
Log Message:
Add missing <powerpc/FOO/spr.h> to a few files missed on the first pass.
Don't export <machine/spr.h> to userland, only <powerpc/spr.h>
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r0 src/sys/arch/amigappc/include/spr.h
cvs rdiff -u -r1.4 -r0 src/sys/arch/bebox/include/spr.h
cvs rdiff -u -r1.4 -r0 src/sys/arch/evbppc/include/spr.h
cvs rdiff -u -r1.2 -r0 src/sys/arch/ibmnws/include/spr.h
cvs rdiff -u -r1.4 -r0 src/sys/arch/macppc/include/spr.h
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/macppc/macppc/cpu.c
cvs rdiff -u -r1.4 -r0 src/sys/arch/mvmeppc/include/spr.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mvmeppc/stand/libsa/srt0.S
cvs rdiff -u -r1.4 -r0 src/sys/arch/ofppc/include/spr.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ofppc/ofppc/cpu.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/powerpc/include/Makefile
cvs rdiff -u -r1.4 -r0 src/sys/arch/prep/include/spr.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/prep/prep/locore.S
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/prep/stand/boot/boot.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/prep/stand/boot/clock.c
cvs rdiff -u -r1.1 -r0 src/sys/arch/rs6000/include/spr.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/rs6000/stand/boot/boot.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/rs6000/stand/boot/clock.c
cvs rdiff -u -r1.4 -r0 src/sys/arch/sandpoint/include/spr.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sandpoint/stand/netboot/entry.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/macppc/macppc/cpu.c
diff -u src/sys/arch/macppc/macppc/cpu.c:1.52 src/sys/arch/macppc/macppc/cpu.c:1.53
--- src/sys/arch/macppc/macppc/cpu.c:1.52 Fri Nov 27 03:23:11 2009
+++ src/sys/arch/macppc/macppc/cpu.c Tue Mar 2 21:52:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.52 2009/11/27 03:23:11 rmind Exp $ */
+/* $NetBSD: cpu.c,v 1.53 2010/03/02 21:52:33 matt Exp $ */
/*-
* Copyright (c) 2001 Tsubai Masanari.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.52 2009/11/27 03:23:11 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.53 2010/03/02 21:52:33 matt Exp $");
#include "opt_ppcparam.h"
#include "opt_multiprocessor.h"
@@ -53,6 +53,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/mvmeppc/stand/libsa/srt0.S
diff -u src/sys/arch/mvmeppc/stand/libsa/srt0.S:1.2 src/sys/arch/mvmeppc/stand/libsa/srt0.S:1.3
--- src/sys/arch/mvmeppc/stand/libsa/srt0.S:1.2 Mon Apr 28 20:23:30 2008
+++ src/sys/arch/mvmeppc/stand/libsa/srt0.S Tue Mar 2 21:52:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: srt0.S,v 1.2 2008/04/28 20:23:30 martin Exp $ */
+/* $NetBSD: srt0.S,v 1.3 2010/03/02 21:52:33 matt Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -32,6 +32,7 @@
#include <machine/asm.h>
#include <machine/psl.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
#define STACK_SIZE 8192
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.12
--- src/sys/arch/ofppc/ofppc/cpu.c:1.11 Mon Apr 28 20:23:31 2008
+++ src/sys/arch/ofppc/ofppc/cpu.c Tue Mar 2 21:52:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.11 2008/04/28 20:23:31 martin Exp $ */
+/* $NetBSD: cpu.c,v 1.12 2010/03/02 21:52:33 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.12 2010/03/02 21:52:33 matt Exp $");
#include "opt_ppcparam.h"
#include "opt_multiprocessor.h"
@@ -42,12 +42,15 @@
#include <sys/device.h>
#include <uvm/uvm_extern.h>
+
#include <dev/ofw/openfirm.h>
-#include <powerpc/oea/hid.h>
-#include <powerpc/oea/bat.h>
+
#include <powerpc/openpic.h>
#include <powerpc/atomic.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
+#include <powerpc/oea/hid.h>
+#include <powerpc/oea/bat.h>
#ifdef ALTIVEC
#include <powerpc/altivec.h>
#endif
Index: src/sys/arch/powerpc/include/Makefile
diff -u src/sys/arch/powerpc/include/Makefile:1.34 src/sys/arch/powerpc/include/Makefile:1.35
--- src/sys/arch/powerpc/include/Makefile:1.34 Fri Feb 9 21:55:10 2007
+++ src/sys/arch/powerpc/include/Makefile Tue Mar 2 21:52:32 2010
@@ -1,6 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2007/02/09 21:55:10 ad Exp $
+# $NetBSD: Makefile,v 1.35 2010/03/02 21:52:32 matt Exp $
+.if !defined(INCSDIR)
INCSDIR?= /usr/include/powerpc
+INCS+= spr.h
+.endif
INCS+= ansi.h aout_machdep.h asm.h atomic.h \
bswap.h \
@@ -14,7 +17,7 @@
math.h mcontext.h mutex.h \
param.h pcb.h pmap.h pmc.h proc.h profile.h psl.h pte.h ptrace.h \
reg.h reloc.h rwlock.h \
- setjmp.h signal.h spr.h stdarg.h \
+ setjmp.h signal.h stdarg.h \
trap.h types.h \
varargs.h \
wchar_limits.h
Index: src/sys/arch/prep/prep/locore.S
diff -u src/sys/arch/prep/prep/locore.S:1.13 src/sys/arch/prep/prep/locore.S:1.14
--- src/sys/arch/prep/prep/locore.S:1.13 Thu Nov 26 00:19:21 2009
+++ src/sys/arch/prep/prep/locore.S Tue Mar 2 21:52:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.13 2009/11/26 00:19:21 matt Exp $ */
+/* $NetBSD: locore.S,v 1.14 2010/03/02 21:52:32 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 "ksyms.h"
Index: src/sys/arch/prep/stand/boot/boot.c
diff -u src/sys/arch/prep/stand/boot/boot.c:1.16 src/sys/arch/prep/stand/boot/boot.c:1.17
--- src/sys/arch/prep/stand/boot/boot.c:1.16 Sat Mar 14 14:46:05 2009
+++ src/sys/arch/prep/stand/boot/boot.c Tue Mar 2 21:52:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.16 2009/03/14 14:46:05 dsl Exp $ */
+/* $NetBSD: boot.c,v 1.17 2010/03/02 21:52:32 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.10
--- 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 Tue Mar 2 21:52:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.9 2006/04/10 18:40:06 garbled Exp $ */
+/* $NetBSD: clock.c,v 1.10 2010/03/02 21:52:32 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/stand/boot/boot.c
diff -u src/sys/arch/rs6000/stand/boot/boot.c:1.3 src/sys/arch/rs6000/stand/boot/boot.c:1.4
--- src/sys/arch/rs6000/stand/boot/boot.c:1.3 Sat Mar 14 14:46:06 2009
+++ src/sys/arch/rs6000/stand/boot/boot.c Tue Mar 2 21:52:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.3 2009/03/14 14:46:06 dsl Exp $ */
+/* $NetBSD: boot.c,v 1.4 2010/03/02 21:52:32 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.2
--- 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 Tue Mar 2 21:52:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.1 2007/12/17 19:09:46 garbled Exp $ */
+/* $NetBSD: clock.c,v 1.2 2010/03/02 21:52:32 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/sandpoint/stand/netboot/entry.S
diff -u src/sys/arch/sandpoint/stand/netboot/entry.S:1.4 src/sys/arch/sandpoint/stand/netboot/entry.S:1.5
--- src/sys/arch/sandpoint/stand/netboot/entry.S:1.4 Fri Jun 12 00:24:33 2009
+++ src/sys/arch/sandpoint/stand/netboot/entry.S Tue Mar 2 21:52:32 2010
@@ -1,7 +1,8 @@
-/* $NetBSD: entry.S,v 1.4 2009/06/12 00:24:33 nisimura Exp $ */
+/* $NetBSD: entry.S,v 1.5 2010/03/02 21:52:32 matt Exp $ */
#include <powerpc/psl.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
#include <powerpc/oea/bat.h>
#include <powerpc/oea/hid.h>
