Module Name: src
Committed By: matt
Date: Mon Jun 20 06:21:46 UTC 2011
Modified Files:
src/sys/arch/powerpc/include: netbsd32_machdep.h
src/sys/arch/powerpc/oea: cpu_subr.c ofwoea_machdep.c
src/sys/arch/powerpc/pic: i8259_common.c ipi_openpic.c openpic_common.c
pic_distopenpic.c pic_i8259.c pic_mpcsoc.c pic_openpic.c
pic_prepivr.c
Log Message:
<arch/powerpc/... -> <powerpc/...
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/include/netbsd32_machdep.h
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/powerpc/oea/cpu_subr.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/oea/ofwoea_machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/pic/i8259_common.c \
src/sys/arch/powerpc/pic/ipi_openpic.c \
src/sys/arch/powerpc/pic/pic_distopenpic.c \
src/sys/arch/powerpc/pic/pic_openpic.c \
src/sys/arch/powerpc/pic/pic_prepivr.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/pic/openpic_common.c \
src/sys/arch/powerpc/pic/pic_i8259.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/powerpc/pic/pic_mpcsoc.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/powerpc/include/netbsd32_machdep.h
diff -u src/sys/arch/powerpc/include/netbsd32_machdep.h:1.6 src/sys/arch/powerpc/include/netbsd32_machdep.h:1.7
--- src/sys/arch/powerpc/include/netbsd32_machdep.h:1.6 Thu Dec 10 14:13:51 2009
+++ src/sys/arch/powerpc/include/netbsd32_machdep.h Mon Jun 20 06:21:45 2011
@@ -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 {
Index: src/sys/arch/powerpc/oea/cpu_subr.c
diff -u src/sys/arch/powerpc/oea/cpu_subr.c:1.66 src/sys/arch/powerpc/oea/cpu_subr.c:1.67
--- src/sys/arch/powerpc/oea/cpu_subr.c:1.66 Fri Jun 17 19:03:04 2011
+++ src/sys/arch/powerpc/oea/cpu_subr.c Mon Jun 20 06:21:45 2011
@@ -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. */
Index: src/sys/arch/powerpc/oea/ofwoea_machdep.c
diff -u src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.21 src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.22
--- src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.21 Sun Jun 12 16:35:10 2011
+++ src/sys/arch/powerpc/oea/ofwoea_machdep.c Mon Jun 20 06:21:45 2011
@@ -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"
Index: src/sys/arch/powerpc/pic/i8259_common.c
diff -u src/sys/arch/powerpc/pic/i8259_common.c:1.5 src/sys/arch/powerpc/pic/i8259_common.c:1.6
--- src/sys/arch/powerpc/pic/i8259_common.c:1.5 Sat Jun 18 06:41:43 2011
+++ src/sys/arch/powerpc/pic/i8259_common.c Mon Jun 20 06:21:45 2011
@@ -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>
Index: src/sys/arch/powerpc/pic/ipi_openpic.c
diff -u src/sys/arch/powerpc/pic/ipi_openpic.c:1.5 src/sys/arch/powerpc/pic/ipi_openpic.c:1.6
--- src/sys/arch/powerpc/pic/ipi_openpic.c:1.5 Sun Jun 5 16:52:26 2011
+++ src/sys/arch/powerpc/pic/ipi_openpic.c Mon Jun 20 06:21:45 2011
@@ -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
Index: src/sys/arch/powerpc/pic/pic_distopenpic.c
diff -u src/sys/arch/powerpc/pic/pic_distopenpic.c:1.5 src/sys/arch/powerpc/pic/pic_distopenpic.c:1.6
--- src/sys/arch/powerpc/pic/pic_distopenpic.c:1.5 Sun Jun 5 16:52:26 2011
+++ src/sys/arch/powerpc/pic/pic_distopenpic.c Mon Jun 20 06:21:45 2011
@@ -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 *);
Index: src/sys/arch/powerpc/pic/pic_openpic.c
diff -u src/sys/arch/powerpc/pic/pic_openpic.c:1.5 src/sys/arch/powerpc/pic/pic_openpic.c:1.6
--- src/sys/arch/powerpc/pic/pic_openpic.c:1.5 Tue Apr 29 06:53:02 2008
+++ src/sys/arch/powerpc/pic/pic_openpic.c Mon Jun 20 06:21:45 2011
@@ -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"
Index: src/sys/arch/powerpc/pic/pic_prepivr.c
diff -u src/sys/arch/powerpc/pic/pic_prepivr.c:1.5 src/sys/arch/powerpc/pic/pic_prepivr.c:1.6
--- src/sys/arch/powerpc/pic/pic_prepivr.c:1.5 Sat Jun 18 06:41:43 2011
+++ src/sys/arch/powerpc/pic/pic_prepivr.c Mon Jun 20 06:21:45 2011
@@ -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 $");
#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>
Index: src/sys/arch/powerpc/pic/openpic_common.c
diff -u src/sys/arch/powerpc/pic/openpic_common.c:1.4 src/sys/arch/powerpc/pic/openpic_common.c:1.5
--- src/sys/arch/powerpc/pic/openpic_common.c:1.4 Sun Jun 5 16:52:26 2011
+++ src/sys/arch/powerpc/pic/openpic_common.c Mon Jun 20 06:21:45 2011
@@ -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;
Index: src/sys/arch/powerpc/pic/pic_i8259.c
diff -u src/sys/arch/powerpc/pic/pic_i8259.c:1.4 src/sys/arch/powerpc/pic/pic_i8259.c:1.5
--- src/sys/arch/powerpc/pic/pic_i8259.c:1.4 Sat Jun 18 06:41:43 2011
+++ src/sys/arch/powerpc/pic/pic_i8259.c Mon Jun 20 06:21:45 2011
@@ -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>
Index: src/sys/arch/powerpc/pic/pic_mpcsoc.c
diff -u src/sys/arch/powerpc/pic/pic_mpcsoc.c:1.1 src/sys/arch/powerpc/pic/pic_mpcsoc.c:1.2
--- src/sys/arch/powerpc/pic/pic_mpcsoc.c:1.1 Wed Aug 19 06:22:54 2009
+++ src/sys/arch/powerpc/pic/pic_mpcsoc.c Mon Jun 20 06:21:45 2011
@@ -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"
