[src/trunk]: src/sys/arch Add missing <powerpc/FOO/spr.h> to a few files miss...

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

details:   https://anonhg.NetBSD.org/src/rev/8aa262db1b0d
branches:  trunk
changeset: 752651:8aa262db1b0d
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Mar 02 21:52:32 2010 +0000

description:
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>

diffstat:

 sys/arch/amigappc/include/spr.h          |   3 ---
 sys/arch/bebox/include/spr.h             |   3 ---
 sys/arch/evbppc/include/spr.h            |   3 ---
 sys/arch/ibmnws/include/spr.h            |   3 ---
 sys/arch/macppc/include/spr.h            |   3 ---
 sys/arch/macppc/macppc/cpu.c             |   5 +++--
 sys/arch/mvmeppc/include/spr.h           |   3 ---
 sys/arch/mvmeppc/stand/libsa/srt0.S      |   3 ++-
 sys/arch/ofppc/include/spr.h             |   3 ---
 sys/arch/ofppc/ofppc/cpu.c               |  11 +++++++----
 sys/arch/powerpc/include/Makefile        |   7 +++++--
 sys/arch/prep/include/spr.h              |   3 ---
 sys/arch/prep/prep/locore.S              |   3 ++-
 sys/arch/prep/stand/boot/boot.c          |   3 ++-
 sys/arch/prep/stand/boot/clock.c         |   3 ++-
 sys/arch/rs6000/include/spr.h            |   3 ---
 sys/arch/rs6000/stand/boot/boot.c        |   3 ++-
 sys/arch/rs6000/stand/boot/clock.c       |   3 ++-
 sys/arch/sandpoint/include/spr.h         |   3 ---
 sys/arch/sandpoint/stand/netboot/entry.S |   3 ++-
 20 files changed, 29 insertions(+), 45 deletions(-)

diffs (270 lines):

diff -r b1e65cda1cc4 -r 8aa262db1b0d sys/arch/amigappc/include/spr.h
--- a/sys/arch/amigappc/include/spr.h   Tue Mar 02 21:32:29 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: spr.h,v 1.2 2005/12/11 12:16:37 christos Exp $ */
-
-#include <powerpc/spr.h>
diff -r b1e65cda1cc4 -r 8aa262db1b0d sys/arch/bebox/include/spr.h
--- a/sys/arch/bebox/include/spr.h      Tue Mar 02 21:32:29 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: spr.h,v 1.4 2005/12/11 12:17:03 christos Exp $ */
-
-#include <powerpc/spr.h>
diff -r b1e65cda1cc4 -r 8aa262db1b0d sys/arch/evbppc/include/spr.h
--- a/sys/arch/evbppc/include/spr.h     Tue Mar 02 21:32:29 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: spr.h,v 1.4 2005/12/11 12:17:12 christos Exp $ */
-
-#include <powerpc/spr.h>
diff -r b1e65cda1cc4 -r 8aa262db1b0d sys/arch/ibmnws/include/spr.h
--- a/sys/arch/ibmnws/include/spr.h     Tue Mar 02 21:32:29 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: spr.h,v 1.2 2005/12/11 12:17:50 christos Exp $ */
-
-#include <powerpc/spr.h>
diff -r b1e65cda1cc4 -r 8aa262db1b0d sys/arch/macppc/include/spr.h
--- a/sys/arch/macppc/include/spr.h     Tue Mar 02 21:32:29 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: spr.h,v 1.4 2005/12/11 12:18:06 christos Exp $ */
-
-#include <powerpc/spr.h>
diff -r b1e65cda1cc4 -r 8aa262db1b0d sys/arch/macppc/macppc/cpu.c
--- a/sys/arch/macppc/macppc/cpu.c      Tue Mar 02 21:32:29 2010 +0000
+++ b/sys/arch/macppc/macppc/cpu.c      Tue Mar 02 21:52:32 2010 +0000
@@ -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
diff -r b1e65cda1cc4 -r 8aa262db1b0d sys/arch/mvmeppc/include/spr.h
--- a/sys/arch/mvmeppc/include/spr.h    Tue Mar 02 21:32:29 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: spr.h,v 1.4 2005/12/11 12:18:19 christos Exp $ */
-
-#include <powerpc/spr.h>
diff -r b1e65cda1cc4 -r 8aa262db1b0d sys/arch/mvmeppc/stand/libsa/srt0.S
--- a/sys/arch/mvmeppc/stand/libsa/srt0.S       Tue Mar 02 21:32:29 2010 +0000
+++ b/sys/arch/mvmeppc/stand/libsa/srt0.S       Tue Mar 02 21:52:32 2010 +0000
@@ -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
 
diff -r b1e65cda1cc4 -r 8aa262db1b0d sys/arch/ofppc/include/spr.h
--- a/sys/arch/ofppc/include/spr.h      Tue Mar 02 21:32:29 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: spr.h,v 1.4 2005/12/11 12:18:29 christos Exp $ */
-
-#include <powerpc/spr.h>
diff -r b1e65cda1cc4 -r 8aa262db1b0d sys/arch/ofppc/ofppc/cpu.c
--- a/sys/arch/ofppc/ofppc/cpu.c        Tue Mar 02 21:32:29 2010 +0000
+++ b/sys/arch/ofppc/ofppc/cpu.c        Tue Mar 02 21:52:32 2010 +0000
@@ -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
diff -r b1e65cda1cc4 -r 8aa262db1b0d sys/arch/powerpc/include/Makefile
--- a/sys/arch/powerpc/include/Makefile Tue Mar 02 21:32:29 2010 +0000
+++ b/sys/arch/powerpc/include/Makefile Tue Mar 02 21:52:32 2010 +0000
@@ -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
diff -r b1e65cda1cc4 -r 8aa262db1b0d sys/arch/prep/include/spr.h
--- a/sys/arch/prep/include/spr.h       Tue Mar 02 21:32:29 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: spr.h,v 1.4 2005/12/11 12:18:47 christos Exp $ */
-
-#include <powerpc/spr.h>
diff -r b1e65cda1cc4 -r 8aa262db1b0d sys/arch/prep/prep/locore.S
--- a/sys/arch/prep/prep/locore.S       Tue Mar 02 21:32:29 2010 +0000
+++ b/sys/arch/prep/prep/locore.S       Tue Mar 02 21:52:32 2010 +0000
@@ -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"
 
diff -r b1e65cda1cc4 -r 8aa262db1b0d sys/arch/prep/stand/boot/boot.c
--- a/sys/arch/prep/stand/boot/boot.c   Tue Mar 02 21:32:29 2010 +0000
+++ b/sys/arch/prep/stand/boot/boot.c   Tue Mar 02 21:52:32 2010 +0000
@@ -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"
 
diff -r b1e65cda1cc4 -r 8aa262db1b0d sys/arch/prep/stand/boot/clock.c
--- a/sys/arch/prep/stand/boot/clock.c  Tue Mar 02 21:32:29 2010 +0000
+++ b/sys/arch/prep/stand/boot/clock.c  Tue Mar 02 21:52:32 2010 +0000
@@ -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"
 
diff -r b1e65cda1cc4 -r 8aa262db1b0d sys/arch/rs6000/include/spr.h
--- a/sys/arch/rs6000/include/spr.h     Tue Mar 02 21:32:29 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: spr.h,v 1.1 2007/12/17 19:09:35 garbled Exp $  */
-
-#include <powerpc/spr.h>
diff -r b1e65cda1cc4 -r 8aa262db1b0d sys/arch/rs6000/stand/boot/boot.c
--- a/sys/arch/rs6000/stand/boot/boot.c Tue Mar 02 21:32:29 2010 +0000
+++ b/sys/arch/rs6000/stand/boot/boot.c Tue Mar 02 21:52:32 2010 +0000
@@ -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"
 
diff -r b1e65cda1cc4 -r 8aa262db1b0d sys/arch/rs6000/stand/boot/clock.c
--- a/sys/arch/rs6000/stand/boot/clock.c        Tue Mar 02 21:32:29 2010 +0000
+++ b/sys/arch/rs6000/stand/boot/clock.c        Tue Mar 02 21:52:32 2010 +0000
@@ -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"
 
diff -r b1e65cda1cc4 -r 8aa262db1b0d sys/arch/sandpoint/include/spr.h
--- a/sys/arch/sandpoint/include/spr.h  Tue Mar 02 21:32:29 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: spr.h,v 1.4 2005/12/11 12:18:51 christos Exp $ */
-
-#include <powerpc/spr.h>
diff -r b1e65cda1cc4 -r 8aa262db1b0d sys/arch/sandpoint/stand/netboot/entry.S
--- a/sys/arch/sandpoint/stand/netboot/entry.S  Tue Mar 02 21:32:29 2010 +0000
+++ b/sys/arch/sandpoint/stand/netboot/entry.S  Tue Mar 02 21:52:32 2010 +0000
@@ -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>