[src/trunk]: src/sys/arch/powerpc/powerpc cleanup includes (include <powerpc/...

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

details:   https://anonhg.NetBSD.org/src/rev/dc7261550ae1
branches:  trunk
changeset: 766269:dc7261550ae1
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Jun 20 05:50:39 2011 +0000

description:
cleanup includes (include <powerpc/psl.h explicitly)

diffstat:

 sys/arch/powerpc/powerpc/clock.c             |   5 +++--
 sys/arch/powerpc/powerpc/compat_13_machdep.c |   6 ++++--
 sys/arch/powerpc/powerpc/compat_16_machdep.c |   5 +++--
 sys/arch/powerpc/powerpc/process_machdep.c   |  17 +++++++++--------
 sys/arch/powerpc/powerpc/rtas.c              |  15 +++++++++------
 sys/arch/powerpc/powerpc/sig_machdep.c       |   5 +++--
 sys/arch/powerpc/powerpc/vm_machdep.c        |   5 +++--
 7 files changed, 34 insertions(+), 24 deletions(-)

diffs (216 lines):

diff -r 55fc00c35a74 -r dc7261550ae1 sys/arch/powerpc/powerpc/clock.c
--- a/sys/arch/powerpc/powerpc/clock.c  Mon Jun 20 05:50:19 2011 +0000
+++ b/sys/arch/powerpc/powerpc/clock.c  Mon Jun 20 05:50:39 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.11 2011/06/16 02:43:43 macallan Exp $      */
+/*     $NetBSD: clock.c,v 1.12 2011/06/20 05:50:39 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.11 2011/06/16 02:43:43 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.12 2011/06/20 05:50:39 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -43,6 +43,7 @@
 
 #include <uvm/uvm_extern.h>
 
+#include <powerpc/psl.h>
 #include <powerpc/spr.h>
 #if defined (PPC_OEA) || defined(PPC_OEA64) || defined (PPC_OEA64_BRIDGE)
 #include <powerpc/oea/spr.h>
diff -r 55fc00c35a74 -r dc7261550ae1 sys/arch/powerpc/powerpc/compat_13_machdep.c
--- a/sys/arch/powerpc/powerpc/compat_13_machdep.c      Mon Jun 20 05:50:19 2011 +0000
+++ b/sys/arch/powerpc/powerpc/compat_13_machdep.c      Mon Jun 20 05:50:39 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat_13_machdep.c,v 1.19 2011/03/16 21:15:29 matt Exp $      */
+/*     $NetBSD: compat_13_machdep.c,v 1.20 2011/06/20 05:50:39 matt Exp $      */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.19 2011/03/16 21:15:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.20 2011/06/20 05:50:39 matt Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ppcarch.h"
@@ -51,6 +51,8 @@
 #include <compat/sys/signal.h>
 #include <compat/sys/signalvar.h>
 
+#include <powerpc/psl.h>
+
 int
 compat_13_sys_sigreturn(struct lwp *l,
     const struct compat_13_sys_sigreturn_args *uap, register_t *retval)
diff -r 55fc00c35a74 -r dc7261550ae1 sys/arch/powerpc/powerpc/compat_16_machdep.c
--- a/sys/arch/powerpc/powerpc/compat_16_machdep.c      Mon Jun 20 05:50:19 2011 +0000
+++ b/sys/arch/powerpc/powerpc/compat_16_machdep.c      Mon Jun 20 05:50:39 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat_16_machdep.c,v 1.18 2011/05/02 02:01:33 matt Exp $      */
+/*     $NetBSD: compat_16_machdep.c,v 1.19 2011/06/20 05:50:39 matt Exp $      */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.18 2011/05/02 02:01:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.19 2011/06/20 05:50:39 matt Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -53,6 +53,7 @@
 #include <compat/sys/signalvar.h>
 
 #include <powerpc/pcb.h>
+#include <powerpc/psl.h>
 #include <powerpc/fpu.h>
 #if defined(ALTIVEC) || defined(PPC_HAVE_SPE)
 #include <powerpc/altivec.h>
diff -r 55fc00c35a74 -r dc7261550ae1 sys/arch/powerpc/powerpc/process_machdep.c
--- a/sys/arch/powerpc/powerpc/process_machdep.c        Mon Jun 20 05:50:19 2011 +0000
+++ b/sys/arch/powerpc/powerpc/process_machdep.c        Mon Jun 20 05:50:39 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: process_machdep.c,v 1.33 2011/06/17 23:12:40 matt Exp $        */
+/*     $NetBSD: process_machdep.c,v 1.34 2011/06/20 05:50:39 matt Exp $        */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,22 +32,23 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.33 2011/06/17 23:12:40 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.34 2011/06/20 05:50:39 matt Exp $");
 
 #include "opt_altivec.h"
 
 #include <sys/param.h>
+#include <sys/cpu.h>
 #include <sys/proc.h>
-#include <sys/systm.h>
-#include <sys/cpu.h>
 #include <sys/ptrace.h>
-
-#include <machine/fpu.h>
-#include <machine/pcb.h>
-#include <machine/reg.h>
+#include <sys/systm.h>
 
 #include <uvm/uvm_extern.h>
 
+#include <powerpc/fpu.h>
+#include <powerpc/pcb.h>
+#include <powerpc/psl.h>
+#include <powerpc/reg.h>
+
 #include <powerpc/altivec.h>   /* also for e500 SPE */
 
 int
diff -r 55fc00c35a74 -r dc7261550ae1 sys/arch/powerpc/powerpc/rtas.c
--- a/sys/arch/powerpc/powerpc/rtas.c   Mon Jun 20 05:50:19 2011 +0000
+++ b/sys/arch/powerpc/powerpc/rtas.c   Mon Jun 20 05:50:39 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtas.c,v 1.11 2011/06/17 19:03:01 matt Exp $ */
+/*     $NetBSD: rtas.c,v 1.12 2011/06/20 05:50:39 matt Exp $ */
 
 /*
  * CHRP RTAS support routines
@@ -9,7 +9,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtas.c,v 1.11 2011/06/17 19:03:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtas.c,v 1.12 2011/06/20 05:50:39 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -19,11 +19,14 @@
 
 #include <dev/clock_subr.h>
 #include <dev/ofw/openfirm.h>
-#include <machine/autoconf.h>
-#include <machine/stdarg.h>
+
+#include <powerpc/stdarg.h>
 #include <powerpc/rtas.h>
+#include <powerpc/psl.h>
 
-int machine_has_rtas = 0;
+#include <machine/autoconf.h>
+
+bool machine_has_rtas;
 
 struct rtas_softc *rtas0_softc;
 
@@ -104,7 +107,7 @@
        char buf[4];
        int i;
 
-       machine_has_rtas = 1;
+       machine_has_rtas = true;
        
        sc->ra_phandle = ph;
        if (OF_getprop(ph, "rtas-version", buf, sizeof buf) != sizeof buf)
diff -r 55fc00c35a74 -r dc7261550ae1 sys/arch/powerpc/powerpc/sig_machdep.c
--- a/sys/arch/powerpc/powerpc/sig_machdep.c    Mon Jun 20 05:50:19 2011 +0000
+++ b/sys/arch/powerpc/powerpc/sig_machdep.c    Mon Jun 20 05:50:39 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sig_machdep.c,v 1.40 2011/03/16 21:15:30 matt Exp $    */
+/*     $NetBSD: sig_machdep.c,v 1.41 2011/06/20 05:50:39 matt Exp $    */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.40 2011/03/16 21:15:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.41 2011/06/20 05:50:39 matt Exp $");
 
 #include "opt_ppcarch.h"
 #include "opt_altivec.h"
@@ -49,6 +49,7 @@
 #include <powerpc/fpu.h>
 #include <powerpc/altivec.h>
 #include <powerpc/pcb.h>
+#include <powerpc/psl.h>
 
 /*
  * Send a signal to process.
diff -r 55fc00c35a74 -r dc7261550ae1 sys/arch/powerpc/powerpc/vm_machdep.c
--- a/sys/arch/powerpc/powerpc/vm_machdep.c     Mon Jun 20 05:50:19 2011 +0000
+++ b/sys/arch/powerpc/powerpc/vm_machdep.c     Mon Jun 20 05:50:39 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vm_machdep.c,v 1.89 2011/06/17 18:59:33 matt Exp $     */
+/*     $NetBSD: vm_machdep.c,v 1.90 2011/06/20 05:50:39 matt Exp $     */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.89 2011/06/17 18:59:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.90 2011/06/20 05:50:39 matt Exp $");
 
 #include "opt_altivec.h"
 #include "opt_multiprocessor.h"
@@ -53,6 +53,7 @@
 #endif
 #include <machine/fpu.h>
 #include <machine/pcb.h>
+#include <machine/psl.h>
 
 #ifdef PPC_IBM4XX
 vaddr_t vmaprange(struct proc *, vaddr_t, vsize_t, int);