[src/trunk]: src/sys/arch/powerpc <arch/powerpc/... -> <powerpc/...

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

details:   https://anonhg.NetBSD.org/src/rev/929211fec072
branches:  trunk
changeset: 766276:929211fec072
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Jun 20 06:21:45 2011 +0000

description:
<arch/powerpc/... -> <powerpc/...

diffstat:

 sys/arch/powerpc/include/netbsd32_machdep.h |   4 ++--
 sys/arch/powerpc/oea/cpu_subr.c             |  13 ++++++++-----
 sys/arch/powerpc/oea/ofwoea_machdep.c       |   6 +++---
 sys/arch/powerpc/pic/i8259_common.c         |   6 +++---
 sys/arch/powerpc/pic/ipi_openpic.c          |   8 ++++----
 sys/arch/powerpc/pic/openpic_common.c       |   6 +++---
 sys/arch/powerpc/pic/pic_distopenpic.c      |   6 +++---
 sys/arch/powerpc/pic/pic_i8259.c            |   6 +++---
 sys/arch/powerpc/pic/pic_mpcsoc.c           |   6 +++---
 sys/arch/powerpc/pic/pic_openpic.c          |   6 +++---
 sys/arch/powerpc/pic/pic_prepivr.c          |   6 +++---
 11 files changed, 38 insertions(+), 35 deletions(-)

diffs (truncated from 311 to 300 lines):

diff -r da2c0b5f6cea -r 929211fec072 sys/arch/powerpc/include/netbsd32_machdep.h
--- a/sys/arch/powerpc/include/netbsd32_machdep.h       Mon Jun 20 06:04:33 2011 +0000
+++ b/sys/arch/powerpc/include/netbsd32_machdep.h       Mon Jun 20 06:21:45 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_machdep.h,v 1.6 2009/12/10 14:13:51 matt Exp $        */
+/*     $NetBSD: netbsd32_machdep.h,v 1.7 2011/06/20 06:21:45 matt Exp $        */
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -45,7 +45,7 @@
 #include <compat/netbsd32/netbsd32.h>
 #include <powerpc/frame.h>
 
-/* from <arch/sparc/include/signal.h> */
+/* from <sparc/include/signal.h> */
 typedef u_int32_t netbsd32_sigcontextp_t;
 
 struct netbsd32_sigcontext {
diff -r da2c0b5f6cea -r 929211fec072 sys/arch/powerpc/oea/cpu_subr.c
--- a/sys/arch/powerpc/oea/cpu_subr.c   Mon Jun 20 06:04:33 2011 +0000
+++ b/sys/arch/powerpc/oea/cpu_subr.c   Mon Jun 20 06:21:45 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu_subr.c,v 1.66 2011/06/17 19:03:04 matt Exp $       */
+/*     $NetBSD: cpu_subr.c,v 1.67 2011/06/20 06:21:45 matt Exp $       */
 
 /*-
  * Copyright (c) 2001 Matt Thomas.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.66 2011/06/17 19:03:04 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.67 2011/06/20 06:21:45 matt Exp $");
 
 #include "opt_ppcparam.h"
 #include "opt_multiprocessor.h"
@@ -52,6 +52,7 @@
 #include <uvm/uvm.h>
 
 #include <powerpc/pcb.h>
+#include <powerpc/psl.h>
 #include <powerpc/spr.h>
 #include <powerpc/oea/hid.h>
 #include <powerpc/oea/hid_601.h>
@@ -238,8 +239,8 @@
 volatile int cpu_hatch_stack;
 extern int ticks_per_intr;
 #include <powerpc/oea/bat.h>
-#include <arch/powerpc/pic/picvar.h>
-#include <arch/powerpc/pic/ipivar.h>
+#include <powerpc/pic/picvar.h>
+#include <powerpc/pic/ipivar.h>
 extern struct bat battable[];
 #else
 struct cpu_info cpu_info[1] = {
@@ -250,7 +251,9 @@
 #endif /*MULTIPROCESSOR*/
 
 int cpu_altivec;
-int cpu_psluserset, cpu_pslusermod;
+register_t cpu_psluserset;
+register_t cpu_pslusermod;
+register_t cpu_pslusermask = 0xffff;
 char cpu_model[80];
 
 /* This is to be called from locore.S, and nowhere else. */
diff -r da2c0b5f6cea -r 929211fec072 sys/arch/powerpc/oea/ofwoea_machdep.c
--- a/sys/arch/powerpc/oea/ofwoea_machdep.c     Mon Jun 20 06:04:33 2011 +0000
+++ b/sys/arch/powerpc/oea/ofwoea_machdep.c     Mon Jun 20 06:21:45 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ofwoea_machdep.c,v 1.21 2011/06/12 16:35:10 matt Exp $ */
+/* $NetBSD: ofwoea_machdep.c,v 1.22 2011/06/20 06:21:45 matt Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.21 2011/06/12 16:35:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.22 2011/06/20 06:21:45 matt Exp $");
 
 #include "opt_ppcarch.h"
 #include "opt_compat_netbsd.h"
@@ -59,7 +59,7 @@
 #include <powerpc/ofw_bus.h>
 #include <powerpc/ofw_cons.h>
 #include <powerpc/spr.h>
-#include <arch/powerpc/pic/picvar.h>
+#include <powerpc/pic/picvar.h>
 
 #include "opt_oea.h"
 
diff -r da2c0b5f6cea -r 929211fec072 sys/arch/powerpc/pic/i8259_common.c
--- a/sys/arch/powerpc/pic/i8259_common.c       Mon Jun 20 06:04:33 2011 +0000
+++ b/sys/arch/powerpc/pic/i8259_common.c       Mon Jun 20 06:21:45 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: i8259_common.c,v 1.5 2011/06/18 06:41:43 matt Exp $ */
+/* $NetBSD: i8259_common.c,v 1.6 2011/06/20 06:21:45 matt Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i8259_common.c,v 1.5 2011/06/18 06:41:43 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i8259_common.c,v 1.6 2011/06/20 06:21:45 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -41,7 +41,7 @@
 
 #include <machine/pio.h>
 
-#include <arch/powerpc/pic/picvar.h>
+#include <powerpc/pic/picvar.h>
 
 #include <dev/isa/isareg.h>
 #include <dev/isa/isavar.h>
diff -r da2c0b5f6cea -r 929211fec072 sys/arch/powerpc/pic/ipi_openpic.c
--- a/sys/arch/powerpc/pic/ipi_openpic.c        Mon Jun 20 06:04:33 2011 +0000
+++ b/sys/arch/powerpc/pic/ipi_openpic.c        Mon Jun 20 06:21:45 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ipi_openpic.c,v 1.5 2011/06/05 16:52:26 matt Exp $ */
+/* $NetBSD: ipi_openpic.c,v 1.6 2011/06/20 06:21:45 matt Exp $ */
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipi_openpic.c,v 1.5 2011/06/05 16:52:26 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipi_openpic.c,v 1.6 2011/06/20 06:21:45 matt Exp $");
 
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
@@ -43,8 +43,8 @@
 #include <machine/pio.h>
 #include <powerpc/openpic.h>
 
-#include <arch/powerpc/pic/picvar.h>
-#include <arch/powerpc/pic/ipivar.h>
+#include <powerpc/pic/picvar.h>
+#include <powerpc/pic/ipivar.h>
 
 #ifdef MULTIPROCESSOR
 
diff -r da2c0b5f6cea -r 929211fec072 sys/arch/powerpc/pic/openpic_common.c
--- a/sys/arch/powerpc/pic/openpic_common.c     Mon Jun 20 06:04:33 2011 +0000
+++ b/sys/arch/powerpc/pic/openpic_common.c     Mon Jun 20 06:21:45 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: openpic_common.c,v 1.4 2011/06/05 16:52:26 matt Exp $ */
+/*     $NetBSD: openpic_common.c,v 1.5 2011/06/20 06:21:45 matt Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: openpic_common.c,v 1.4 2011/06/05 16:52:26 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: openpic_common.c,v 1.5 2011/06/20 06:21:45 matt Exp $");
 
 #include "opt_openpic.h"
 #include "opt_interrupt.h"
@@ -41,7 +41,7 @@
 #include <machine/pio.h>
 #include <powerpc/openpic.h>
 
-#include <arch/powerpc/pic/picvar.h>
+#include <powerpc/pic/picvar.h>
 
 volatile unsigned char *openpic_base;
 
diff -r da2c0b5f6cea -r 929211fec072 sys/arch/powerpc/pic/pic_distopenpic.c
--- a/sys/arch/powerpc/pic/pic_distopenpic.c    Mon Jun 20 06:04:33 2011 +0000
+++ b/sys/arch/powerpc/pic/pic_distopenpic.c    Mon Jun 20 06:21:45 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pic_distopenpic.c,v 1.5 2011/06/05 16:52:26 matt Exp $ */
+/*     $NetBSD: pic_distopenpic.c,v 1.6 2011/06/20 06:21:45 matt Exp $ */
 
 /*-
  * Copyright (c) 2008 Tim Rightnour
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_distopenpic.c,v 1.5 2011/06/05 16:52:26 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_distopenpic.c,v 1.6 2011/06/20 06:21:45 matt Exp $");
 
 #include "opt_openpic.h"
 #include "opt_interrupt.h"
@@ -44,7 +44,7 @@
 #include <machine/pio.h>
 #include <powerpc/openpic.h>
 
-#include <arch/powerpc/pic/picvar.h>
+#include <powerpc/pic/picvar.h>
 
 /* distributed stuff */
 static int opic_isu_from_irq(struct openpic_ops *, int, int *);
diff -r da2c0b5f6cea -r 929211fec072 sys/arch/powerpc/pic/pic_i8259.c
--- a/sys/arch/powerpc/pic/pic_i8259.c  Mon Jun 20 06:04:33 2011 +0000
+++ b/sys/arch/powerpc/pic/pic_i8259.c  Mon Jun 20 06:21:45 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_i8259.c,v 1.4 2011/06/18 06:41:43 matt Exp $ */
+/* $NetBSD: pic_i8259.c,v 1.5 2011/06/20 06:21:45 matt Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_i8259.c,v 1.4 2011/06/18 06:41:43 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_i8259.c,v 1.5 2011/06/20 06:21:45 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -41,7 +41,7 @@
 
 #include <machine/pio.h>
 
-#include <arch/powerpc/pic/picvar.h>
+#include <powerpc/pic/picvar.h>
 
 #include <dev/isa/isareg.h>
 #include <dev/isa/isavar.h>
diff -r da2c0b5f6cea -r 929211fec072 sys/arch/powerpc/pic/pic_mpcsoc.c
--- a/sys/arch/powerpc/pic/pic_mpcsoc.c Mon Jun 20 06:04:33 2011 +0000
+++ b/sys/arch/powerpc/pic/pic_mpcsoc.c Mon Jun 20 06:21:45 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pic_mpcsoc.c,v 1.1 2009/08/19 06:22:54 nisimura Exp $ */
+/*     $NetBSD: pic_mpcsoc.c,v 1.2 2011/06/20 06:21:45 matt Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_mpcsoc.c,v 1.1 2009/08/19 06:22:54 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_mpcsoc.c,v 1.2 2011/06/20 06:21:45 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -38,7 +38,7 @@
 #include <machine/pio.h>
 #include <powerpc/openpic.h>
 
-#include <arch/powerpc/pic/picvar.h>
+#include <powerpc/pic/picvar.h>
 
 #include "opt_interrupt.h"
 
diff -r da2c0b5f6cea -r 929211fec072 sys/arch/powerpc/pic/pic_openpic.c
--- a/sys/arch/powerpc/pic/pic_openpic.c        Mon Jun 20 06:04:33 2011 +0000
+++ b/sys/arch/powerpc/pic/pic_openpic.c        Mon Jun 20 06:21:45 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pic_openpic.c,v 1.5 2008/04/29 06:53:02 martin Exp $ */
+/*     $NetBSD: pic_openpic.c,v 1.6 2011/06/20 06:21:45 matt Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_openpic.c,v 1.5 2008/04/29 06:53:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_openpic.c,v 1.6 2011/06/20 06:21:45 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -38,7 +38,7 @@
 #include <machine/pio.h>
 #include <powerpc/openpic.h>
 
-#include <arch/powerpc/pic/picvar.h>
+#include <powerpc/pic/picvar.h>
 
 #include "opt_interrupt.h"
 
diff -r da2c0b5f6cea -r 929211fec072 sys/arch/powerpc/pic/pic_prepivr.c
--- a/sys/arch/powerpc/pic/pic_prepivr.c        Mon Jun 20 06:04:33 2011 +0000
+++ b/sys/arch/powerpc/pic/pic_prepivr.c        Mon Jun 20 06:21:45 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_prepivr.c,v 1.5 2011/06/18 06:41:43 matt Exp $ */
+/* $NetBSD: pic_prepivr.c,v 1.6 2011/06/20 06:21:45 matt Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_prepivr.c,v 1.5 2011/06/18 06:41:43 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_prepivr.c,v 1.6 2011/06/20 06:21:45 matt Exp $");