Module Name: src
Committed By: rin
Date: Mon Jul 6 09:34:18 UTC 2020
Modified Files:
src/sys/arch/powerpc/booke: booke_cache.c booke_machdep.c booke_pmap.c
booke_stubs.c copyin.c copyout.c e500_intr.c e500_tlb.c kcopy.c
spe.c spe_subr.S trap.c
src/sys/arch/powerpc/booke/dev: cpunode.c e500wdog.c pq3cfi.c pq3ddrc.c
pq3diic.c pq3duart.c pq3ehci.c pq3etsec.c pq3gpio.c pq3nandfcm.c
pq3obio.c
src/sys/arch/powerpc/booke/pci: pq3pci.c
src/sys/arch/powerpc/fpu: fpu_emu.c
src/sys/arch/powerpc/ibm4xx: ibm4xx_machdep.c pic_uic.c trap.c
src/sys/arch/powerpc/ibm4xx/dev: com_opb.c emacreg.h if_emac.c opb.c
plb.c rgmii.c
src/sys/arch/powerpc/ibm4xx/openbios: locore.S
src/sys/arch/powerpc/ibm4xx/pci: pchb.c
src/sys/arch/powerpc/include: aout_machdep.h bus_defs.h db_machdep.h
fpu.h frame.h param.h psl.h reloc.h signal.h trap.h userret.h
src/sys/arch/powerpc/include/booke: e500var.h pmap.h
src/sys/arch/powerpc/include/oea: bat.h
src/sys/arch/powerpc/marvell: marvell_intr.h
src/sys/arch/powerpc/oea: altivec.c altivec_subr.S cpu_speedctl.c
cpu_subr.c genassym.cf oea_machdep.c ofw_consinit.c
ofwoea_machdep.c pmap.c pmap_kernel.c prep_machdep.c
src/sys/arch/powerpc/pci: pchb.c pci_machdep_common.c pci_module.c
pcib.c pciconf_ofmethod.c
src/sys/arch/powerpc/pic: intr.c ipi.c ipi_openpic.c openpic_common.c
pic_distopenpic.c pic_mpcsoc.c pic_openpic.c
src/sys/arch/powerpc/powerpc: bus_dma.c bus_space.c compat_16_machdep.c
db_interface.c db_trace.c fixup.c fpu.c intr_stubs.c kgdb_machdep.c
linux_syscall.c lock_stubs.S locore_subr.S ofwreal.S openfirm.c
pmap_subr.c powerpc_machdep.c process_machdep.c setfault.S
sig_machdep.c syscall.c trap.c trap_subr.S vm_machdep.c
Log Message:
Style and cosmetic changes. No binary changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/booke/booke_cache.c \
src/sys/arch/powerpc/booke/spe_subr.S
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/powerpc/booke/booke_machdep.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/powerpc/booke/booke_pmap.c \
src/sys/arch/powerpc/booke/trap.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/booke/booke_stubs.c \
src/sys/arch/powerpc/booke/spe.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/booke/copyin.c \
src/sys/arch/powerpc/booke/copyout.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/powerpc/booke/e500_intr.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/powerpc/booke/e500_tlb.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/booke/kcopy.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/booke/dev/cpunode.c \
src/sys/arch/powerpc/booke/dev/pq3cfi.c \
src/sys/arch/powerpc/booke/dev/pq3duart.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/booke/dev/e500wdog.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/powerpc/booke/dev/pq3ddrc.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/booke/dev/pq3diic.c \
src/sys/arch/powerpc/booke/dev/pq3obio.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/powerpc/booke/dev/pq3ehci.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/powerpc/booke/dev/pq3etsec.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/booke/dev/pq3gpio.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/booke/dev/pq3nandfcm.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/powerpc/booke/pci/pq3pci.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/powerpc/fpu/fpu_emu.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/ibm4xx/pic_uic.c
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/powerpc/ibm4xx/trap.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/powerpc/ibm4xx/dev/com_opb.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/ibm4xx/dev/emacreg.h
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/powerpc/ibm4xx/dev/if_emac.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/powerpc/ibm4xx/dev/opb.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/ibm4xx/dev/plb.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/powerpc/ibm4xx/dev/rgmii.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/ibm4xx/openbios/locore.S
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/ibm4xx/pci/pchb.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/include/aout_machdep.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/include/bus_defs.h
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/powerpc/include/db_machdep.h
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/powerpc/include/fpu.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/powerpc/include/frame.h
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/powerpc/include/param.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/powerpc/include/psl.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/powerpc/include/reloc.h
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/include/signal.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/include/trap.h
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/powerpc/include/userret.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/include/booke/e500var.h
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/include/booke/pmap.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/powerpc/include/oea/bat.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/powerpc/marvell/marvell_intr.h
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/powerpc/oea/altivec.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/oea/altivec_subr.S
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/powerpc/oea/cpu_speedctl.c
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/powerpc/oea/cpu_subr.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/powerpc/oea/genassym.cf
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/powerpc/oea/oea_machdep.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/powerpc/oea/ofw_consinit.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/powerpc/oea/ofwoea_machdep.c
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/powerpc/oea/pmap.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/oea/pmap_kernel.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/oea/prep_machdep.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/powerpc/pci/pchb.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/powerpc/pci/pci_machdep_common.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/powerpc/pci/pci_module.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/pci/pcib.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/pci/pciconf_ofmethod.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/powerpc/pic/intr.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/powerpc/pic/ipi.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/pic/ipi_openpic.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/pic/openpic_common.c \
src/sys/arch/powerpc/pic/pic_mpcsoc.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/pic/pic_distopenpic.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/pic/pic_openpic.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/powerpc/powerpc/bus_dma.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/powerpc/powerpc/bus_space.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/powerpc/powerpc/compat_16_machdep.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/powerpc/powerpc/db_interface.c
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/powerpc/powerpc/db_trace.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/powerpc/fixup.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/powerpc/powerpc/fpu.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/powerpc/intr_stubs.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/powerpc/powerpc/kgdb_machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/powerpc/linux_syscall.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/powerpc/lock_stubs.S
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/powerpc/powerpc/locore_subr.S
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/powerpc/powerpc/ofwreal.S
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/powerpc/powerpc/openfirm.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/powerpc/powerpc/pmap_subr.c
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/powerpc/powerpc/powerpc_machdep.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/powerpc/powerpc/process_machdep.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/powerpc/powerpc/setfault.S
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/powerpc/powerpc/sig_machdep.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/powerpc/powerpc/syscall.c
cvs rdiff -u -r1.157 -r1.158 src/sys/arch/powerpc/powerpc/trap.c
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/powerpc/powerpc/trap_subr.S
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/powerpc/powerpc/vm_machdep.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/booke/booke_cache.c
diff -u src/sys/arch/powerpc/booke/booke_cache.c:1.4 src/sys/arch/powerpc/booke/booke_cache.c:1.5
--- src/sys/arch/powerpc/booke/booke_cache.c:1.4 Wed Jun 29 21:53:10 2011
+++ src/sys/arch/powerpc/booke/booke_cache.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: booke_cache.c,v 1.4 2011/06/29 21:53:10 dholland Exp $ */
+/* $NetBSD: booke_cache.c,v 1.5 2020/07/06 09:34:16 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -33,12 +33,9 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- *
- */
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: booke_cache.c,v 1.4 2011/06/29 21:53:10 dholland Exp $");
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: booke_cache.c,v 1.5 2020/07/06 09:34:16 rin Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
Index: src/sys/arch/powerpc/booke/spe_subr.S
diff -u src/sys/arch/powerpc/booke/spe_subr.S:1.4 src/sys/arch/powerpc/booke/spe_subr.S:1.5
--- src/sys/arch/powerpc/booke/spe_subr.S:1.4 Sun Aug 10 18:08:33 2014
+++ src/sys/arch/powerpc/booke/spe_subr.S Mon Jul 6 09:34:16 2020
@@ -28,9 +28,10 @@
*/
#include <machine/asm.h>
+
#include "assym.h"
-RCSID("$NetBSD: spe_subr.S,v 1.4 2014/08/10 18:08:33 joerg Exp $")
+RCSID("$NetBSD: spe_subr.S,v 1.5 2020/07/06 09:34:16 rin Exp $")
.text
#ifndef __clang__
Index: src/sys/arch/powerpc/booke/booke_machdep.c
diff -u src/sys/arch/powerpc/booke/booke_machdep.c:1.30 src/sys/arch/powerpc/booke/booke_machdep.c:1.31
--- src/sys/arch/powerpc/booke/booke_machdep.c:1.30 Thu Jun 11 19:20:44 2020
+++ src/sys/arch/powerpc/booke/booke_machdep.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: booke_machdep.c,v 1.30 2020/06/11 19:20:44 ad Exp $ */
+/* $NetBSD: booke_machdep.c,v 1.31 2020/07/06 09:34:16 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -38,9 +38,11 @@
#define _POWERPC_BUS_DMA_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: booke_machdep.c,v 1.30 2020/06/11 19:20:44 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: booke_machdep.c,v 1.31 2020/07/06 09:34:16 rin Exp $");
+#ifdef _KERNEL_OPT
#include "opt_modular.h"
+#endif
#include <sys/param.h>
#include <sys/cpu.h>
Index: src/sys/arch/powerpc/booke/booke_pmap.c
diff -u src/sys/arch/powerpc/booke/booke_pmap.c:1.27 src/sys/arch/powerpc/booke/booke_pmap.c:1.28
--- src/sys/arch/powerpc/booke/booke_pmap.c:1.27 Wed Mar 11 13:30:31 2020
+++ src/sys/arch/powerpc/booke/booke_pmap.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: booke_pmap.c,v 1.27 2020/03/11 13:30:31 thorpej Exp $ */
+/* $NetBSD: booke_pmap.c,v 1.28 2020/07/06 09:34:16 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -37,8 +37,7 @@
#define __PMAP_PRIVATE
#include <sys/cdefs.h>
-
-__KERNEL_RCSID(0, "$NetBSD: booke_pmap.c,v 1.27 2020/03/11 13:30:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: booke_pmap.c,v 1.28 2020/07/06 09:34:16 rin Exp $");
#include <sys/param.h>
#include <sys/kcore.h>
Index: src/sys/arch/powerpc/booke/trap.c
diff -u src/sys/arch/powerpc/booke/trap.c:1.27 src/sys/arch/powerpc/booke/trap.c:1.28
--- src/sys/arch/powerpc/booke/trap.c:1.27 Sat Jan 27 10:07:41 2018
+++ src/sys/arch/powerpc/booke/trap.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.27 2018/01/27 10:07:41 flxd Exp $ */
+/* $NetBSD: trap.c,v 1.28 2020/07/06 09:34:16 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,11 +34,12 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include "opt_ddb.h"
-
#include <sys/cdefs.h>
+__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.28 2020/07/06 09:34:16 rin Exp $");
-__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.27 2018/01/27 10:07:41 flxd Exp $");
+#ifdef _KERNEL_OPT
+#include "opt_ddb.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/powerpc/booke/booke_stubs.c
diff -u src/sys/arch/powerpc/booke/booke_stubs.c:1.10 src/sys/arch/powerpc/booke/booke_stubs.c:1.11
--- src/sys/arch/powerpc/booke/booke_stubs.c:1.10 Mon Jul 11 16:06:52 2016
+++ src/sys/arch/powerpc/booke/booke_stubs.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: booke_stubs.c,v 1.10 2016/07/11 16:06:52 matt Exp $ */
+/* $NetBSD: booke_stubs.c,v 1.11 2020/07/06 09:34:16 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,8 +35,7 @@
*/
#include <sys/cdefs.h>
-
-__KERNEL_RCSID(0, "$NetBSD: booke_stubs.c,v 1.10 2016/07/11 16:06:52 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: booke_stubs.c,v 1.11 2020/07/06 09:34:16 rin Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
Index: src/sys/arch/powerpc/booke/spe.c
diff -u src/sys/arch/powerpc/booke/spe.c:1.10 src/sys/arch/powerpc/booke/spe.c:1.11
--- src/sys/arch/powerpc/booke/spe.c:1.10 Fri Mar 17 23:43:43 2017
+++ src/sys/arch/powerpc/booke/spe.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: spe.c,v 1.10 2017/03/17 23:43:43 chs Exp $ */
+/* $NetBSD: spe.c,v 1.11 2020/07/06 09:34:16 rin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,9 +30,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spe.c,v 1.10 2017/03/17 23:43:43 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spe.c,v 1.11 2020/07/06 09:34:16 rin Exp $");
+#ifdef _KERNEL_OPT
#include "opt_altivec.h"
+#endif
#ifdef PPC_HAVE_SPE
Index: src/sys/arch/powerpc/booke/copyin.c
diff -u src/sys/arch/powerpc/booke/copyin.c:1.8 src/sys/arch/powerpc/booke/copyin.c:1.9
--- src/sys/arch/powerpc/booke/copyin.c:1.8 Mon Mar 2 03:34:28 2020
+++ src/sys/arch/powerpc/booke/copyin.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: copyin.c,v 1.8 2020/03/02 03:34:28 rin Exp $ */
+/* $NetBSD: copyin.c,v 1.9 2020/07/06 09:34:16 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
@@ -35,11 +35,11 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: copyin.c,v 1.8 2020/03/02 03:34:28 rin Exp $");
-
#define __UFETCHSTORE_PRIVATE
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: copyin.c,v 1.9 2020/07/06 09:34:16 rin Exp $");
+
#include <sys/param.h>
#include <sys/lwp.h>
#include <sys/systm.h>
Index: src/sys/arch/powerpc/booke/copyout.c
diff -u src/sys/arch/powerpc/booke/copyout.c:1.8 src/sys/arch/powerpc/booke/copyout.c:1.9
--- src/sys/arch/powerpc/booke/copyout.c:1.8 Thu Mar 5 02:02:08 2020
+++ src/sys/arch/powerpc/booke/copyout.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: copyout.c,v 1.8 2020/03/05 02:02:08 rin Exp $ */
+/* $NetBSD: copyout.c,v 1.9 2020/07/06 09:34:16 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
@@ -35,11 +35,11 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: copyout.c,v 1.8 2020/03/05 02:02:08 rin Exp $");
-
#define __UFETCHSTORE_PRIVATE
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: copyout.c,v 1.9 2020/07/06 09:34:16 rin Exp $");
+
#include <sys/param.h>
#include <sys/lwp.h>
#include <sys/systm.h>
Index: src/sys/arch/powerpc/booke/e500_intr.c
diff -u src/sys/arch/powerpc/booke/e500_intr.c:1.42 src/sys/arch/powerpc/booke/e500_intr.c:1.43
--- src/sys/arch/powerpc/booke/e500_intr.c:1.42 Mon Jul 6 08:13:00 2020
+++ src/sys/arch/powerpc/booke/e500_intr.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: e500_intr.c,v 1.42 2020/07/06 08:13:00 rin Exp $ */
+/* $NetBSD: e500_intr.c,v 1.43 2020/07/06 09:34:16 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,14 +34,16 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include "opt_mpc85xx.h"
-#include "opt_multiprocessor.h"
-#include "opt_ddb.h"
-
#define __INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.42 2020/07/06 08:13:00 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.43 2020/07/06 09:34:16 rin Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_ddb.h"
+#include "opt_mpc85xx.h"
+#include "opt_multiprocessor.h"
+#endif
#include <sys/param.h>
#include <sys/proc.h>
Index: src/sys/arch/powerpc/booke/e500_tlb.c
diff -u src/sys/arch/powerpc/booke/e500_tlb.c:1.19 src/sys/arch/powerpc/booke/e500_tlb.c:1.20
--- src/sys/arch/powerpc/booke/e500_tlb.c:1.19 Mon Sep 3 16:29:26 2018
+++ src/sys/arch/powerpc/booke/e500_tlb.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: e500_tlb.c,v 1.19 2018/09/03 16:29:26 riastradh Exp $ */
+/* $NetBSD: e500_tlb.c,v 1.20 2020/07/06 09:34:16 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,13 +34,14 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include "opt_ppcparam.h"
-
#define __PMAP_PRIVATE
#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: e500_tlb.c,v 1.20 2020/07/06 09:34:16 rin Exp $");
-__KERNEL_RCSID(0, "$NetBSD: e500_tlb.c,v 1.19 2018/09/03 16:29:26 riastradh Exp $");
+#ifdef _KERNEL_OPT
+#include "opt_ppcparam.h"
+#endif
#include <sys/param.h>
Index: src/sys/arch/powerpc/booke/kcopy.c
diff -u src/sys/arch/powerpc/booke/kcopy.c:1.2 src/sys/arch/powerpc/booke/kcopy.c:1.3
--- src/sys/arch/powerpc/booke/kcopy.c:1.2 Tue Jan 18 01:02:52 2011
+++ src/sys/arch/powerpc/booke/kcopy.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kcopy.c,v 1.2 2011/01/18 01:02:52 matt Exp $ */
+/* $NetBSD: kcopy.c,v 1.3 2020/07/06 09:34:16 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,8 +35,7 @@
*/
#include <sys/cdefs.h>
-
-__KERNEL_RCSID(0, "$NetBSD: kcopy.c,v 1.2 2011/01/18 01:02:52 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kcopy.c,v 1.3 2020/07/06 09:34:16 rin Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
Index: src/sys/arch/powerpc/booke/dev/cpunode.c
diff -u src/sys/arch/powerpc/booke/dev/cpunode.c:1.5 src/sys/arch/powerpc/booke/dev/cpunode.c:1.6
--- src/sys/arch/powerpc/booke/dev/cpunode.c:1.5 Sat May 28 05:25:39 2011
+++ src/sys/arch/powerpc/booke/dev/cpunode.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpunode.c,v 1.5 2011/05/28 05:25:39 matt Exp $ */
+/* $NetBSD: cpunode.c,v 1.6 2020/07/06 09:34:16 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,15 +35,14 @@
*/
#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: cpunode.c,v 1.6 2020/07/06 09:34:16 rin Exp $");
-__KERNEL_RCSID(0, "$NetBSD: cpunode.c,v 1.5 2011/05/28 05:25:39 matt Exp $");
+#include "ioconf.h"
#include <sys/param.h>
#include <sys/device.h>
#include <sys/cpu.h>
-#include "ioconf.h"
-
#include <powerpc/booke/cpuvar.h>
static int cpunode_match(device_t, cfdata_t, void *);
Index: src/sys/arch/powerpc/booke/dev/pq3cfi.c
diff -u src/sys/arch/powerpc/booke/dev/pq3cfi.c:1.5 src/sys/arch/powerpc/booke/dev/pq3cfi.c:1.6
--- src/sys/arch/powerpc/booke/dev/pq3cfi.c:1.5 Wed Jul 18 19:01:50 2012
+++ src/sys/arch/powerpc/booke/dev/pq3cfi.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3cfi.c,v 1.5 2012/07/18 19:01:50 matt Exp $ */
+/* $NetBSD: pq3cfi.c,v 1.6 2020/07/06 09:34:16 rin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -32,11 +32,14 @@
* NOR CFI driver support for booke
*/
-#include "opt_flash.h"
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: pq3cfi.c,v 1.6 2020/07/06 09:34:16 rin Exp $");
+
#include "locators.h"
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pq3cfi.c,v 1.5 2012/07/18 19:01:50 matt Exp $");
+#ifdef _KERNEL_OPT
+#include "opt_flash.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/powerpc/booke/dev/pq3duart.c
diff -u src/sys/arch/powerpc/booke/dev/pq3duart.c:1.5 src/sys/arch/powerpc/booke/dev/pq3duart.c:1.6
--- src/sys/arch/powerpc/booke/dev/pq3duart.c:1.5 Sat Dec 8 17:46:12 2018
+++ src/sys/arch/powerpc/booke/dev/pq3duart.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3duart.c,v 1.5 2018/12/08 17:46:12 thorpej Exp $ */
+/* $NetBSD: pq3duart.c,v 1.6 2020/07/06 09:34:16 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,16 +35,15 @@
*/
#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: pq3duart.c,v 1.6 2020/07/06 09:34:16 rin Exp $");
-__KERNEL_RCSID(0, "$NetBSD: pq3duart.c,v 1.5 2018/12/08 17:46:12 thorpej Exp $");
+#include "ioconf.h"
#include <sys/param.h>
#include <sys/cpu.h>
#include <sys/device.h>
#include <sys/tty.h>
-#include "ioconf.h"
-
#include <sys/intr.h>
#include <sys/bus.h>
Index: src/sys/arch/powerpc/booke/dev/e500wdog.c
diff -u src/sys/arch/powerpc/booke/dev/e500wdog.c:1.3 src/sys/arch/powerpc/booke/dev/e500wdog.c:1.4
--- src/sys/arch/powerpc/booke/dev/e500wdog.c:1.3 Mon Aug 1 17:05:16 2011
+++ src/sys/arch/powerpc/booke/dev/e500wdog.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: e500wdog.c,v 1.3 2011/08/01 17:05:16 matt Exp $ */
+/* $NetBSD: e500wdog.c,v 1.4 2020/07/06 09:34:16 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,8 +35,9 @@
*/
#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: e500wdog.c,v 1.4 2020/07/06 09:34:16 rin Exp $");
-__KERNEL_RCSID(0, "$NetBSD: e500wdog.c,v 1.3 2011/08/01 17:05:16 matt Exp $");
+#include "ioconf.h"
#include <sys/param.h>
#include <sys/cpu.h>
@@ -45,8 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: e500wdog.c,v
#include <dev/sysmon/sysmonvar.h>
-#include "ioconf.h"
-
#include <sys/intr.h>
#include <powerpc/spr.h>
Index: src/sys/arch/powerpc/booke/dev/pq3ddrc.c
diff -u src/sys/arch/powerpc/booke/dev/pq3ddrc.c:1.1 src/sys/arch/powerpc/booke/dev/pq3ddrc.c:1.2
--- src/sys/arch/powerpc/booke/dev/pq3ddrc.c:1.1 Tue Aug 2 00:21:00 2011
+++ src/sys/arch/powerpc/booke/dev/pq3ddrc.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3ddrc.c,v 1.1 2011/08/02 00:21:00 matt Exp $ */
+/* $NetBSD: pq3ddrc.c,v 1.2 2020/07/06 09:34:16 rin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -33,11 +33,11 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
+
#define DDRC_PRIVATE
#include <sys/cdefs.h>
-
-__KERNEL_RCSID(0, "$NetBSD: pq3ddrc.c,v 1.1 2011/08/02 00:21:00 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3ddrc.c,v 1.2 2020/07/06 09:34:16 rin Exp $");
#include "ioconf.h"
Index: src/sys/arch/powerpc/booke/dev/pq3diic.c
diff -u src/sys/arch/powerpc/booke/dev/pq3diic.c:1.4 src/sys/arch/powerpc/booke/dev/pq3diic.c:1.5
--- src/sys/arch/powerpc/booke/dev/pq3diic.c:1.4 Mon Sep 3 16:29:26 2018
+++ src/sys/arch/powerpc/booke/dev/pq3diic.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3diic.c,v 1.4 2018/09/03 16:29:26 riastradh Exp $ */
+/* $NetBSD: pq3diic.c,v 1.5 2020/07/06 09:34:16 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,16 +35,15 @@
*/
#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: pq3diic.c,v 1.5 2020/07/06 09:34:16 rin Exp $");
-__KERNEL_RCSID(0, "$NetBSD: pq3diic.c,v 1.4 2018/09/03 16:29:26 riastradh Exp $");
+#include "ioconf.h"
#include <sys/param.h>
#include <sys/cpu.h>
#include <sys/device.h>
#include <sys/tty.h>
-#include "ioconf.h"
-
#include <sys/intr.h>
#include <sys/bus.h>
Index: src/sys/arch/powerpc/booke/dev/pq3obio.c
diff -u src/sys/arch/powerpc/booke/dev/pq3obio.c:1.4 src/sys/arch/powerpc/booke/dev/pq3obio.c:1.5
--- src/sys/arch/powerpc/booke/dev/pq3obio.c:1.4 Thu Jun 25 14:52:00 2020
+++ src/sys/arch/powerpc/booke/dev/pq3obio.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3obio.c,v 1.4 2020/06/25 14:52:00 jdolecek Exp $ */
+/* $NetBSD: pq3obio.c,v 1.5 2020/07/06 09:34:16 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -36,11 +36,10 @@
#define LBC_PRIVATE
-#include "locators.h"
-
#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: pq3obio.c,v 1.5 2020/07/06 09:34:16 rin Exp $");
-__KERNEL_RCSID(0, "$NetBSD: pq3obio.c,v 1.4 2020/06/25 14:52:00 jdolecek Exp $");
+#include "locators.h"
#include <sys/param.h>
#include <sys/device.h>
Index: src/sys/arch/powerpc/booke/dev/pq3ehci.c
diff -u src/sys/arch/powerpc/booke/dev/pq3ehci.c:1.9 src/sys/arch/powerpc/booke/dev/pq3ehci.c:1.10
--- src/sys/arch/powerpc/booke/dev/pq3ehci.c:1.9 Wed Aug 21 04:17:41 2019
+++ src/sys/arch/powerpc/booke/dev/pq3ehci.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3ehci.c,v 1.9 2019/08/21 04:17:41 msaitoh Exp $ */
+/* $NetBSD: pq3ehci.c,v 1.10 2020/07/06 09:34:16 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,9 +29,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pq3ehci.c,v 1.9 2019/08/21 04:17:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3ehci.c,v 1.10 2020/07/06 09:34:16 rin Exp $");
+#ifdef _KERNEL_OPT
#include "opt_usb.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/powerpc/booke/dev/pq3etsec.c
diff -u src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.49 src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.50
--- src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.49 Thu Jan 30 06:27:13 2020
+++ src/sys/arch/powerpc/booke/dev/pq3etsec.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3etsec.c,v 1.49 2020/01/30 06:27:13 martin Exp $ */
+/* $NetBSD: pq3etsec.c,v 1.50 2020/07/06 09:34:16 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,14 +34,15 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.50 2020/07/06 09:34:16 rin Exp $");
+
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_mpc85xx.h"
#include "opt_multiprocessor.h"
#include "opt_net_mpsafe.h"
-
-#include <sys/cdefs.h>
-
-__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.49 2020/01/30 06:27:13 martin Exp $");
+#endif
#include <sys/param.h>
#include <sys/cpu.h>
Index: src/sys/arch/powerpc/booke/dev/pq3gpio.c
diff -u src/sys/arch/powerpc/booke/dev/pq3gpio.c:1.11 src/sys/arch/powerpc/booke/dev/pq3gpio.c:1.12
--- src/sys/arch/powerpc/booke/dev/pq3gpio.c:1.11 Sat Dec 27 16:19:33 2014
+++ src/sys/arch/powerpc/booke/dev/pq3gpio.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3gpio.c,v 1.11 2014/12/27 16:19:33 nonaka Exp $ */
+/* $NetBSD: pq3gpio.c,v 1.12 2020/07/06 09:34:16 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -37,11 +37,12 @@
#define GLOBAL_PRIVATE
#define GPIO_PRIVATE
-#include "opt_mpc85xx.h"
-
#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: pq3gpio.c,v 1.12 2020/07/06 09:34:16 rin Exp $");
-__KERNEL_RCSID(0, "$NetBSD: pq3gpio.c,v 1.11 2014/12/27 16:19:33 nonaka Exp $");
+#ifdef _KERNEL_OPT
+#include "opt_mpc85xx.h"
+#endif
#include <sys/param.h>
#include <sys/cpu.h>
Index: src/sys/arch/powerpc/booke/dev/pq3nandfcm.c
diff -u src/sys/arch/powerpc/booke/dev/pq3nandfcm.c:1.2 src/sys/arch/powerpc/booke/dev/pq3nandfcm.c:1.3
--- src/sys/arch/powerpc/booke/dev/pq3nandfcm.c:1.2 Sun Jul 17 23:08:56 2011
+++ src/sys/arch/powerpc/booke/dev/pq3nandfcm.c Mon Jul 6 09:34:16 2020
@@ -27,12 +27,14 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include "opt_flash.h"
#define LBC_PRIVATE
#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: pq3nandfcm.c,v 1.3 2020/07/06 09:34:16 rin Exp $");
-__KERNEL_RCSID(0, "$NetBSD: pq3nandfcm.c,v 1.2 2011/07/17 23:08:56 dyoung Exp $");
+#ifdef _KERNEL_OPT
+#include "opt_flash.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/powerpc/booke/pci/pq3pci.c
diff -u src/sys/arch/powerpc/booke/pci/pq3pci.c:1.23 src/sys/arch/powerpc/booke/pci/pq3pci.c:1.24
--- src/sys/arch/powerpc/booke/pci/pq3pci.c:1.23 Thu Jun 1 02:45:07 2017
+++ src/sys/arch/powerpc/booke/pci/pq3pci.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3pci.c,v 1.23 2017/06/01 02:45:07 chs Exp $ */
+/* $NetBSD: pq3pci.c,v 1.24 2020/07/06 09:34:16 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -38,13 +38,15 @@
#define GLOBAL_PRIVATE
#define __INTR_PRIVATE
-#include "opt_mpc85xx.h"
-#include "opt_pci.h"
-#include "locators.h"
-
#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: pq3pci.c,v 1.24 2020/07/06 09:34:16 rin Exp $");
-__KERNEL_RCSID(0, "$NetBSD: pq3pci.c,v 1.23 2017/06/01 02:45:07 chs Exp $");
+#include "locators.h"
+
+#ifdef _KERNEL_OPT
+#include "opt_mpc85xx.h"
+#include "opt_pci.h"
+#endif
#include <sys/param.h>
#include <sys/device.h>
Index: src/sys/arch/powerpc/fpu/fpu_emu.c
diff -u src/sys/arch/powerpc/fpu/fpu_emu.c:1.22 src/sys/arch/powerpc/fpu/fpu_emu.c:1.23
--- src/sys/arch/powerpc/fpu/fpu_emu.c:1.22 Sat Jun 27 04:31:06 2020
+++ src/sys/arch/powerpc/fpu/fpu_emu.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_emu.c,v 1.22 2020/06/27 04:31:06 rin Exp $ */
+/* $NetBSD: fpu_emu.c,v 1.23 2020/07/06 09:34:16 rin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -76,9 +76,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_emu.c,v 1.22 2020/06/27 04:31:06 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_emu.c,v 1.23 2020/07/06 09:34:16 rin Exp $");
+#ifdef _KERNEL_OPT
#include "opt_ddb.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c
diff -u src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.29 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.30
--- src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.29 Thu Jun 11 19:20:44 2020
+++ src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ibm4xx_machdep.c,v 1.29 2020/06/11 19:20:44 ad Exp $ */
+/* $NetBSD: ibm4xx_machdep.c,v 1.30 2020/07/06 09:34:16 rin Exp $ */
/* Original: ibm40x_machdep.c,v 1.3 2005/01/17 17:19:36 shige Exp $ */
/*
@@ -68,13 +68,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.29 2020/06/11 19:20:44 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.30 2020/07/06 09:34:16 rin Exp $");
+#include "ksyms.h"
+
+#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_modular.h"
-#include "ksyms.h" /* for NKSYMS */
+#endif
#include <sys/param.h>
#include <sys/msgbuf.h>
Index: src/sys/arch/powerpc/ibm4xx/pic_uic.c
diff -u src/sys/arch/powerpc/ibm4xx/pic_uic.c:1.5 src/sys/arch/powerpc/ibm4xx/pic_uic.c:1.6
--- src/sys/arch/powerpc/ibm4xx/pic_uic.c:1.5 Thu Mar 5 11:33:14 2020
+++ src/sys/arch/powerpc/ibm4xx/pic_uic.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_uic.c,v 1.5 2020/03/05 11:33:14 rin Exp $ */
+/* $NetBSD: pic_uic.c,v 1.6 2020/07/06 09:34:16 rin Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_uic.c,v 1.5 2020/03/05 11:33:14 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_uic.c,v 1.6 2020/07/06 09:34:16 rin Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -52,7 +52,6 @@ __KERNEL_RCSID(0, "$NetBSD: pic_uic.c,v
#include <powerpc/pic/picvar.h>
-
/*
* Number of interrupts (hard + soft), irq number legality test,
* mapping of irq number to mask and a way to pick irq number
Index: src/sys/arch/powerpc/ibm4xx/trap.c
diff -u src/sys/arch/powerpc/ibm4xx/trap.c:1.81 src/sys/arch/powerpc/ibm4xx/trap.c:1.82
--- src/sys/arch/powerpc/ibm4xx/trap.c:1.81 Fri Jun 19 07:31:59 2020
+++ src/sys/arch/powerpc/ibm4xx/trap.c Mon Jul 6 09:34:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.81 2020/06/19 07:31:59 rin Exp $ */
+/* $NetBSD: trap.c,v 1.82 2020/07/06 09:34:16 rin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -66,14 +66,16 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#define __UFETCHSTORE_PRIVATE
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.81 2020/06/19 07:31:59 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.82 2020/07/06 09:34:16 rin Exp $");
+#ifdef _KERNEL_OPT
#include "opt_altivec.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
-
-#define __UFETCHSTORE_PRIVATE
+#endif
#include <sys/param.h>
#include <sys/cpu.h>
Index: src/sys/arch/powerpc/ibm4xx/dev/com_opb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/com_opb.c:1.23 src/sys/arch/powerpc/ibm4xx/dev/com_opb.c:1.24
--- src/sys/arch/powerpc/ibm4xx/dev/com_opb.c:1.23 Sun Dec 15 09:38:40 2019
+++ src/sys/arch/powerpc/ibm4xx/dev/com_opb.c Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: com_opb.c,v 1.23 2019/12/15 09:38:40 rin Exp $ */
+/* $NetBSD: com_opb.c,v 1.24 2020/07/06 09:34:17 rin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -61,7 +61,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_opb.c,v 1.23 2019/12/15 09:38:40 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_opb.c,v 1.24 2020/07/06 09:34:17 rin Exp $");
+
+#include "com.h"
#include <sys/param.h>
#include <sys/device.h>
@@ -76,7 +78,6 @@ __KERNEL_RCSID(0, "$NetBSD: com_opb.c,v
#include <powerpc/ibm4xx/dev/opbvar.h>
#include <powerpc/ibm4xx/dev/comopbvar.h>
-#include "com.h"
#if (NCOM > 0)
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: src/sys/arch/powerpc/ibm4xx/dev/emacreg.h
diff -u src/sys/arch/powerpc/ibm4xx/dev/emacreg.h:1.3 src/sys/arch/powerpc/ibm4xx/dev/emacreg.h:1.4
--- src/sys/arch/powerpc/ibm4xx/dev/emacreg.h:1.3 Thu Mar 18 13:47:04 2010
+++ src/sys/arch/powerpc/ibm4xx/dev/emacreg.h Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: emacreg.h,v 1.3 2010/03/18 13:47:04 kiyohara Exp $ */
+/* $NetBSD: emacreg.h,v 1.4 2020/07/06 09:34:17 rin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,6 @@
#define EMAC_MAX_MTU 9022
-
/* Number of Ethernet MAC Registers */
#define EMAC_NREG 0x100
Index: src/sys/arch/powerpc/ibm4xx/dev/if_emac.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/if_emac.c:1.52 src/sys/arch/powerpc/ibm4xx/dev/if_emac.c:1.53
--- src/sys/arch/powerpc/ibm4xx/dev/if_emac.c:1.52 Wed Jan 29 05:35:28 2020
+++ src/sys/arch/powerpc/ibm4xx/dev/if_emac.c Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_emac.c,v 1.52 2020/01/29 05:35:28 thorpej Exp $ */
+/* $NetBSD: if_emac.c,v 1.53 2020/07/06 09:34:17 rin Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -52,9 +52,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_emac.c,v 1.52 2020/01/29 05:35:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_emac.c,v 1.53 2020/07/06 09:34:17 rin Exp $");
+#ifdef _KERNEL_OPT
#include "opt_emac.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/powerpc/ibm4xx/dev/opb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/opb.c:1.26 src/sys/arch/powerpc/ibm4xx/dev/opb.c:1.27
--- src/sys/arch/powerpc/ibm4xx/dev/opb.c:1.26 Sat Jun 18 06:41:42 2011
+++ src/sys/arch/powerpc/ibm4xx/dev/opb.c Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: opb.c,v 1.26 2011/06/18 06:41:42 matt Exp $ */
+/* $NetBSD: opb.c,v 1.27 2020/07/06 09:34:17 rin Exp $ */
/*
* Copyright 2001,2002 Wasabi Systems, Inc.
@@ -66,10 +66,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opb.c,v 1.26 2011/06/18 06:41:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opb.c,v 1.27 2020/07/06 09:34:17 rin Exp $");
#include "locators.h"
+
+#ifdef _KERNEL_OPT
#include "opt_emac.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/powerpc/ibm4xx/dev/plb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.21 src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.22
--- src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.21 Thu Nov 21 13:33:15 2013
+++ src/sys/arch/powerpc/ibm4xx/dev/plb.c Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: plb.c,v 1.21 2013/11/21 13:33:15 kiyohara Exp $ */
+/* $NetBSD: plb.c,v 1.22 2020/07/06 09:34:17 rin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -66,10 +66,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plb.c,v 1.21 2013/11/21 13:33:15 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plb.c,v 1.22 2020/07/06 09:34:17 rin Exp $");
-#include "locators.h"
#include "emac.h"
+#include "locators.h"
#define _POWERPC_BUS_DMA_PRIVATE
Index: src/sys/arch/powerpc/ibm4xx/dev/rgmii.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/rgmii.c:1.1 src/sys/arch/powerpc/ibm4xx/dev/rgmii.c:1.2
--- src/sys/arch/powerpc/ibm4xx/dev/rgmii.c:1.1 Thu Mar 18 13:47:04 2010
+++ src/sys/arch/powerpc/ibm4xx/dev/rgmii.c Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rgmii.c,v 1.1 2010/03/18 13:47:04 kiyohara Exp $ */
+/* $NetBSD: rgmii.c,v 1.2 2020/07/06 09:34:17 rin Exp $ */
/*
* Copyright (c) 2010 KIYOHARA Takashi
* All rights reserved.
@@ -24,8 +24,9 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rgmii.c,v 1.1 2010/03/18 13:47:04 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rgmii.c,v 1.2 2020/07/06 09:34:17 rin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
Index: src/sys/arch/powerpc/ibm4xx/openbios/locore.S
diff -u src/sys/arch/powerpc/ibm4xx/openbios/locore.S:1.12 src/sys/arch/powerpc/ibm4xx/openbios/locore.S:1.13
--- src/sys/arch/powerpc/ibm4xx/openbios/locore.S:1.12 Sun Jul 15 05:16:44 2018
+++ src/sys/arch/powerpc/ibm4xx/openbios/locore.S Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.12 2018/07/15 05:16:44 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.13 2020/07/06 09:34:17 rin Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -69,14 +69,17 @@
#undef PPC_4XX_NOCACHE
+#include "assym.h"
+#include "ksyms.h"
+
+#ifdef _KERNEL_OPT
#include "opt_ddb.h"
#include "opt_lockdebug.h"
#include "opt_modular.h"
#include "opt_multiprocessor.h"
#include "opt_ppcarch.h"
#include "opt_ppcparam.h"
-#include "assym.h"
-#include "ksyms.h"
+#endif
#include <sys/syscall.h>
Index: src/sys/arch/powerpc/ibm4xx/pci/pchb.c
diff -u src/sys/arch/powerpc/ibm4xx/pci/pchb.c:1.12 src/sys/arch/powerpc/ibm4xx/pci/pchb.c:1.13
--- src/sys/arch/powerpc/ibm4xx/pci/pchb.c:1.12 Sun Jun 14 01:40:05 2020
+++ src/sys/arch/powerpc/ibm4xx/pci/pchb.c Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pchb.c,v 1.12 2020/06/14 01:40:05 chs Exp $ */
+/* $NetBSD: pchb.c,v 1.13 2020/07/06 09:34:17 rin Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -28,11 +28,15 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.12 2020/06/14 01:40:05 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.13 2020/07/06 09:34:17 rin Exp $");
#include "pci.h"
+
+#ifdef _KERNEL_OPT
#include "opt_pci.h"
+#endif
#include <sys/types.h>
#include <sys/param.h>
Index: src/sys/arch/powerpc/include/aout_machdep.h
diff -u src/sys/arch/powerpc/include/aout_machdep.h:1.5 src/sys/arch/powerpc/include/aout_machdep.h:1.6
--- src/sys/arch/powerpc/include/aout_machdep.h:1.5 Tue Dec 10 17:14:17 2002
+++ src/sys/arch/powerpc/include/aout_machdep.h Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: aout_machdep.h,v 1.5 2002/12/10 17:14:17 thorpej Exp $ */
+/* $NetBSD: aout_machdep.h,v 1.6 2020/07/06 09:34:17 rin Exp $ */
/*-
* Copyright (C) 1995 Wolfgang Solfrank.
@@ -30,6 +30,7 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
#ifndef _POWERPC_AOUT_MACHDEP_H_
#define _POWERPC_AOUT_MACHDEP_H_
Index: src/sys/arch/powerpc/include/bus_defs.h
diff -u src/sys/arch/powerpc/include/bus_defs.h:1.3 src/sys/arch/powerpc/include/bus_defs.h:1.4
--- src/sys/arch/powerpc/include/bus_defs.h:1.3 Mon Sep 23 16:17:57 2019
+++ src/sys/arch/powerpc/include/bus_defs.h Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_defs.h,v 1.3 2019/09/23 16:17:57 skrll Exp $ */
+/* $NetBSD: bus_defs.h,v 1.4 2020/07/06 09:34:17 rin Exp $ */
/* $OpenBSD: bus.h,v 1.1 1997/10/13 10:53:42 pefo Exp $ */
/*-
@@ -97,12 +97,15 @@
#ifndef _POWERPC_BUS_DEFS_H_
#define _POWERPC_BUS_DEFS_H_
-#if defined(_KERNEL_OPT) && !defined(BUS_DMA_DONTCACHE)
+#ifdef _KERNEL_OPT
#include "opt_ppcarch.h"
+#endif
+
+#ifndef BUS_DMA_DONTCACHE
#if defined(PPC_IBM4XX) || defined(PPC_BOOKE)
#define BUS_DMA_DONTCACHE (BUS_DMA_COHERENT|BUS_DMA_NOCACHE)
-#endif /* PPC_IBM4XX */
-#endif /* _KERNEL_OPT && !BUS_DMA_DONTCACHE */
+#endif
+#endif
/*
* Bus access types.
Index: src/sys/arch/powerpc/include/db_machdep.h
diff -u src/sys/arch/powerpc/include/db_machdep.h:1.27 src/sys/arch/powerpc/include/db_machdep.h:1.28
--- src/sys/arch/powerpc/include/db_machdep.h:1.27 Sun Dec 15 06:05:00 2019
+++ src/sys/arch/powerpc/include/db_machdep.h Mon Jul 6 09:34:17 2020
@@ -1,5 +1,5 @@
/* $OpenBSD: db_machdep.h,v 1.2 1997/03/21 00:48:48 niklas Exp $ */
-/* $NetBSD: db_machdep.h,v 1.27 2019/12/15 06:05:00 rin Exp $ */
+/* $NetBSD: db_machdep.h,v 1.28 2020/07/06 09:34:17 rin Exp $ */
/*
* Mach Operating System
@@ -33,14 +33,14 @@
#ifndef _PPC_DB_MACHDEP_H_
#define _PPC_DB_MACHDEP_H_
-#include <uvm/uvm_prot.h>
-#include <uvm/uvm_param.h>
-#include <machine/trap.h>
-
#ifdef _KERNEL
#include "opt_ppcarch.h"
#endif
+#include <uvm/uvm_prot.h>
+#include <uvm/uvm_param.h>
+#include <machine/trap.h>
+
#define DB_ELF_SYMBOLS
typedef vaddr_t db_addr_t; /* address - unsigned */
Index: src/sys/arch/powerpc/include/fpu.h
diff -u src/sys/arch/powerpc/include/fpu.h:1.22 src/sys/arch/powerpc/include/fpu.h:1.23
--- src/sys/arch/powerpc/include/fpu.h:1.22 Thu Apr 19 21:50:07 2018
+++ src/sys/arch/powerpc/include/fpu.h Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.h,v 1.22 2018/04/19 21:50:07 christos Exp $ */
+/* $NetBSD: fpu.h,v 1.23 2020/07/06 09:34:17 rin Exp $ */
/*-
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -30,6 +30,7 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
#ifndef _POWERPC_FPU_H_
#define _POWERPC_FPU_H_
@@ -68,9 +69,9 @@
#ifdef _KERNEL
-#if defined(_KERNEL_OPT)
-#include "opt_ppcarch.h"
+#ifdef _KERNEL_OPT
#include "opt_multiprocessor.h"
+#include "opt_ppcarch.h"
#endif
#include <sys/pcu.h>
Index: src/sys/arch/powerpc/include/frame.h
diff -u src/sys/arch/powerpc/include/frame.h:1.28 src/sys/arch/powerpc/include/frame.h:1.29
--- src/sys/arch/powerpc/include/frame.h:1.28 Mon Jul 6 08:18:57 2020
+++ src/sys/arch/powerpc/include/frame.h Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: frame.h,v 1.28 2020/07/06 08:18:57 rin Exp $ */
+/* $NetBSD: frame.h,v 1.29 2020/07/06 09:34:17 rin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -30,16 +30,15 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
#ifndef _POWERPC_FRAME_H_
#define _POWERPC_FRAME_H_
#include <machine/types.h>
-#ifdef _KERNEL
#ifdef _KERNEL_OPT
#include "opt_ppcarch.h"
#endif
-#endif
/*
* We have to save all registers on every trap, because
Index: src/sys/arch/powerpc/include/param.h
diff -u src/sys/arch/powerpc/include/param.h:1.32 src/sys/arch/powerpc/include/param.h:1.33
--- src/sys/arch/powerpc/include/param.h:1.32 Fri Feb 21 12:56:37 2020
+++ src/sys/arch/powerpc/include/param.h Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.32 2020/02/21 12:56:37 rin Exp $ */
+/* $NetBSD: param.h,v 1.33 2020/07/06 09:34:17 rin Exp $ */
/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -34,11 +34,9 @@
#ifndef _POWERPC_PARAM_H
#define _POWERPC_PARAM_H
-#ifdef _KERNEL
-#if defined(_KERNEL_OPT)
+#ifdef _KERNEL_OPT
#include "opt_ppcarch.h"
#endif
-#endif
/*
* Machine dependent constants for PowerPC
Index: src/sys/arch/powerpc/include/psl.h
diff -u src/sys/arch/powerpc/include/psl.h:1.20 src/sys/arch/powerpc/include/psl.h:1.21
--- src/sys/arch/powerpc/include/psl.h:1.20 Mon Jul 6 05:36:26 2015
+++ src/sys/arch/powerpc/include/psl.h Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: psl.h,v 1.20 2015/07/06 05:36:26 matt Exp $ */
+/* $NetBSD: psl.h,v 1.21 2020/07/06 09:34:17 rin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -30,6 +30,7 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
#ifndef _POWERPC_PSL_H_
#define _POWERPC_PSL_H_
Index: src/sys/arch/powerpc/include/reloc.h
diff -u src/sys/arch/powerpc/include/reloc.h:1.1 src/sys/arch/powerpc/include/reloc.h:1.2
--- src/sys/arch/powerpc/include/reloc.h:1.1 Mon Sep 30 16:34:33 1996
+++ src/sys/arch/powerpc/include/reloc.h Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: reloc.h,v 1.1 1996/09/30 16:34:33 ws Exp $ */
+/* $NetBSD: reloc.h,v 1.2 2020/07/06 09:34:17 rin Exp $ */
/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -30,6 +30,7 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
#ifndef _MACH_RELOC_H_
#define _MACH_RELOC_H_
Index: src/sys/arch/powerpc/include/signal.h
diff -u src/sys/arch/powerpc/include/signal.h:1.21 src/sys/arch/powerpc/include/signal.h:1.22
--- src/sys/arch/powerpc/include/signal.h:1.21 Wed Nov 29 17:36:16 2017
+++ src/sys/arch/powerpc/include/signal.h Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: signal.h,v 1.21 2017/11/29 17:36:16 christos Exp $ */
+/* $NetBSD: signal.h,v 1.22 2020/07/06 09:34:17 rin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -30,6 +30,7 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
#ifndef _POWERPC_SIGNAL_H_
#define _POWERPC_SIGNAL_H_
Index: src/sys/arch/powerpc/include/trap.h
diff -u src/sys/arch/powerpc/include/trap.h:1.13 src/sys/arch/powerpc/include/trap.h:1.14
--- src/sys/arch/powerpc/include/trap.h:1.13 Mon Mar 3 15:36:36 2014
+++ src/sys/arch/powerpc/include/trap.h Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.h,v 1.13 2014/03/03 15:36:36 macallan Exp $ */
+/* $NetBSD: trap.h,v 1.14 2020/07/06 09:34:17 rin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -30,6 +30,7 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
#ifndef _POWERPC_TRAP_H_
#define _POWERPC_TRAP_H_
Index: src/sys/arch/powerpc/include/userret.h
diff -u src/sys/arch/powerpc/include/userret.h:1.30 src/sys/arch/powerpc/include/userret.h:1.31
--- src/sys/arch/powerpc/include/userret.h:1.30 Mon Jul 6 05:55:37 2015
+++ src/sys/arch/powerpc/include/userret.h Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: userret.h,v 1.30 2015/07/06 05:55:37 matt Exp $ */
+/* $NetBSD: userret.h,v 1.31 2020/07/06 09:34:17 rin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -31,8 +31,10 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "opt_ppcarch.h"
+#ifdef _KERNEL_OPT
#include "opt_altivec.h"
+#include "opt_ppcarch.h"
+#endif
#include <sys/userret.h>
#include <sys/ras.h>
Index: src/sys/arch/powerpc/include/booke/e500var.h
diff -u src/sys/arch/powerpc/include/booke/e500var.h:1.8 src/sys/arch/powerpc/include/booke/e500var.h:1.9
--- src/sys/arch/powerpc/include/booke/e500var.h:1.8 Mon Jul 6 08:14:54 2020
+++ src/sys/arch/powerpc/include/booke/e500var.h Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: e500var.h,v 1.8 2020/07/06 08:14:54 rin Exp $ */
+/* $NetBSD: e500var.h,v 1.9 2020/07/06 09:34:17 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -39,13 +39,11 @@
#ifdef _KERNEL
+#include "locators.h"
+
#include <sys/device.h>
#include <sys/extent.h>
-#ifdef _KERNEL_OPT
-#include "locators.h"
-#endif
-
#define E500_CLOCK_TIMER 0 /* could be 0..3 */
extern const struct intrsw e500_intrsw;
Index: src/sys/arch/powerpc/include/booke/pmap.h
diff -u src/sys/arch/powerpc/include/booke/pmap.h:1.21 src/sys/arch/powerpc/include/booke/pmap.h:1.22
--- src/sys/arch/powerpc/include/booke/pmap.h:1.21 Wed Apr 8 10:57:16 2020
+++ src/sys/arch/powerpc/include/booke/pmap.h Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.21 2020/04/08 10:57:16 skrll Exp $ */
+/* $NetBSD: pmap.h,v 1.22 2020/07/06 09:34:17 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -33,6 +33,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
+
#ifndef _POWERPC_BOOKE_PMAP_H_
#define _POWERPC_BOOKE_PMAP_H_
Index: src/sys/arch/powerpc/include/oea/bat.h
diff -u src/sys/arch/powerpc/include/oea/bat.h:1.18 src/sys/arch/powerpc/include/oea/bat.h:1.19
--- src/sys/arch/powerpc/include/oea/bat.h:1.18 Sun Jul 6 08:06:03 2014
+++ src/sys/arch/powerpc/include/oea/bat.h Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bat.h,v 1.18 2014/07/06 08:06:03 mrg Exp $ */
+/* $NetBSD: bat.h,v 1.19 2020/07/06 09:34:17 rin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -64,6 +64,7 @@
#define _POWERPC_OEA_BAT_H_
#if defined(_KERNEL) && !defined(_LOCORE)
+
#include <powerpc/psl.h>
struct bat {
Index: src/sys/arch/powerpc/marvell/marvell_intr.h
diff -u src/sys/arch/powerpc/marvell/marvell_intr.h:1.18 src/sys/arch/powerpc/marvell/marvell_intr.h:1.19
--- src/sys/arch/powerpc/marvell/marvell_intr.h:1.18 Fri Jun 17 23:37:38 2011
+++ src/sys/arch/powerpc/marvell/marvell_intr.h Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: marvell_intr.h,v 1.18 2011/06/17 23:37:38 matt Exp $ */
+/* $NetBSD: marvell_intr.h,v 1.19 2020/07/06 09:34:17 rin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,6 @@
#ifndef _POWERPC_MARVELL_INTR_H_
#define _POWERPC_MARVELL_INTR_H_
-
#ifndef _LOCORE
#define __IMASK_T uint64_t
Index: src/sys/arch/powerpc/oea/altivec.c
diff -u src/sys/arch/powerpc/oea/altivec.c:1.31 src/sys/arch/powerpc/oea/altivec.c:1.32
--- src/sys/arch/powerpc/oea/altivec.c:1.31 Thu Mar 16 16:13:20 2017
+++ src/sys/arch/powerpc/oea/altivec.c Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: altivec.c,v 1.31 2017/03/16 16:13:20 chs Exp $ */
+/* $NetBSD: altivec.c,v 1.32 2020/07/06 09:34:17 rin Exp $ */
/*
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -32,9 +32,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altivec.c,v 1.31 2017/03/16 16:13:20 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altivec.c,v 1.32 2020/07/06 09:34:17 rin Exp $");
+#ifdef _KERNEL_OPT
#include "opt_multiprocessor.h"
+#endif
#include <sys/param.h>
#include <sys/proc.h>
Index: src/sys/arch/powerpc/oea/altivec_subr.S
diff -u src/sys/arch/powerpc/oea/altivec_subr.S:1.2 src/sys/arch/powerpc/oea/altivec_subr.S:1.3
--- src/sys/arch/powerpc/oea/altivec_subr.S:1.2 Tue Jan 18 01:02:55 2011
+++ src/sys/arch/powerpc/oea/altivec_subr.S Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: altivec_subr.S,v 1.2 2011/01/18 01:02:55 matt Exp $ */
+/* $NetBSD: altivec_subr.S,v 1.3 2020/07/06 09:34:17 rin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -28,9 +28,11 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include "opt_altivec.h"
+RCSID("$NetBSD: altivec_subr.S,v 1.3 2020/07/06 09:34:17 rin Exp $")
-RCSID("$NetBSD: altivec_subr.S,v 1.2 2011/01/18 01:02:55 matt Exp $")
+#ifdef _KERNEL_OPT
+#include "opt_altivec.h"
+#endif
#ifdef ALTIVEC
/*
Index: src/sys/arch/powerpc/oea/cpu_speedctl.c
diff -u src/sys/arch/powerpc/oea/cpu_speedctl.c:1.1 src/sys/arch/powerpc/oea/cpu_speedctl.c:1.2
--- src/sys/arch/powerpc/oea/cpu_speedctl.c:1.1 Fri Jun 1 18:06:58 2018
+++ src/sys/arch/powerpc/oea/cpu_speedctl.c Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_speedctl.c,v 1.1 2018/06/01 18:06:58 macallan Exp $ */
+/* $NetBSD: cpu_speedctl.c,v 1.2 2020/07/06 09:34:17 rin Exp $ */
/*-
* Copyright (c) 2006 Michael Lorenz
@@ -25,10 +25,13 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_speedctl.c,v 1.1 2018/06/01 18:06:58 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_speedctl.c,v 1.2 2020/07/06 09:34:17 rin Exp $");
+#ifdef _KERNEL_OPT
#include "opt_ppcparam.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/powerpc/oea/cpu_subr.c
diff -u src/sys/arch/powerpc/oea/cpu_subr.c:1.102 src/sys/arch/powerpc/oea/cpu_subr.c:1.103
--- src/sys/arch/powerpc/oea/cpu_subr.c:1.102 Fri Oct 25 17:17:30 2019
+++ src/sys/arch/powerpc/oea/cpu_subr.c Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_subr.c,v 1.102 2019/10/25 17:17:30 macallan Exp $ */
+/* $NetBSD: cpu_subr.c,v 1.103 2020/07/06 09:34:17 rin Exp $ */
/*-
* Copyright (c) 2001 Matt Thomas.
@@ -34,14 +34,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.102 2019/10/25 17:17:30 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.103 2020/07/06 09:34:17 rin Exp $");
-#include "opt_ppcparam.h"
-#include "opt_ppccache.h"
-#include "opt_multiprocessor.h"
-#include "opt_altivec.h"
#include "sysmon_envsys.h"
+#ifdef _KERNEL_OPT
+#include "opt_altivec.h"
+#include "opt_multiprocessor.h"
+#include "opt_ppccache.h"
+#include "opt_ppcparam.h"
+#endif
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
Index: src/sys/arch/powerpc/oea/genassym.cf
diff -u src/sys/arch/powerpc/oea/genassym.cf:1.27 src/sys/arch/powerpc/oea/genassym.cf:1.28
--- src/sys/arch/powerpc/oea/genassym.cf:1.27 Sun Jul 15 05:16:44 2018
+++ src/sys/arch/powerpc/oea/genassym.cf Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.27 2018/07/15 05:16:44 maxv Exp $
+# $NetBSD: genassym.cf,v 1.28 2020/07/06 09:34:17 rin Exp $
#
# Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -31,7 +31,9 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
+#ifdef _KERNEL_OPT
include "opt_ppcarch.h"
+#endif
include <sys/param.h>
include <sys/time.h>
Index: src/sys/arch/powerpc/oea/oea_machdep.c
diff -u src/sys/arch/powerpc/oea/oea_machdep.c:1.79 src/sys/arch/powerpc/oea/oea_machdep.c:1.80
--- src/sys/arch/powerpc/oea/oea_machdep.c:1.79 Thu Jun 11 19:20:44 2020
+++ src/sys/arch/powerpc/oea/oea_machdep.c Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: oea_machdep.c,v 1.79 2020/06/11 19:20:44 ad Exp $ */
+/* $NetBSD: oea_machdep.c,v 1.80 2020/07/06 09:34:17 rin Exp $ */
/*
* Copyright (C) 2002 Matt Thomas
@@ -33,14 +33,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.79 2020/06/11 19:20:44 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.80 2020/07/06 09:34:17 rin Exp $");
-#include "opt_ppcarch.h"
+#ifdef _KERNEL_OPT
+#include "opt_altivec.h"
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_multiprocessor.h"
-#include "opt_altivec.h"
+#include "opt_ppcarch.h"
+#endif
#include <sys/param.h>
#include <sys/buf.h>
Index: src/sys/arch/powerpc/oea/ofw_consinit.c
diff -u src/sys/arch/powerpc/oea/ofw_consinit.c:1.18 src/sys/arch/powerpc/oea/ofw_consinit.c:1.19
--- src/sys/arch/powerpc/oea/ofw_consinit.c:1.18 Wed Apr 15 13:33:13 2020
+++ src/sys/arch/powerpc/oea/ofw_consinit.c Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_consinit.c,v 1.18 2020/04/15 13:33:13 rin Exp $ */
+/* $NetBSD: ofw_consinit.c,v 1.19 2020/07/06 09:34:17 rin Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,18 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_consinit.c,v 1.18 2020/04/15 13:33:13 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_consinit.c,v 1.19 2020/07/06 09:34:17 rin Exp $");
+
+#include "adb.h"
+#include "adbkbd.h"
+#include "akbd.h"
+#include "isa.h"
+#include "ofb.h"
+#include "pckbc.h"
+#include "ukbd.h"
+#include "wsdisplay.h"
+#include "zsc.h"
+#include "zstty.h"
#include <sys/param.h>
#include <sys/buf.h>
@@ -50,23 +61,14 @@ __KERNEL_RCSID(0, "$NetBSD: ofw_consinit
#include <dev/wscons/wsksymvar.h>
#include <dev/wscons/wscons_callbacks.h>
-#include "akbd.h"
-#include "adbkbd.h"
-#include "wsdisplay.h"
-#include "ofb.h"
-#include "isa.h"
-
-#include "zsc.h"
#if NZSC > 0
#include <machine/z8530var.h>
#endif
-#include "adb.h"
#if (NADB > 0)
#include <macppc/dev/adbvar.h>
#endif
-#include "ukbd.h"
#if (NUKBD > 0)
#include <dev/usb/ukbdvar.h>
struct usb_kbd_ihandles {
@@ -75,13 +77,11 @@ struct usb_kbd_ihandles {
};
#endif
-#include "zstty.h"
#if (NZSTTY > 0)
#include <dev/ic/z8530reg.h>
extern struct consdev consdev_zs;
#endif
-#include "pckbc.h"
#if (NPCKBC > 0)
#include <dev/isa/isareg.h>
#include <dev/ic/i8042reg.h>
Index: src/sys/arch/powerpc/oea/ofwoea_machdep.c
diff -u src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.47 src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.48
--- src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.47 Fri Feb 28 22:14:10 2020
+++ src/sys/arch/powerpc/oea/ofwoea_machdep.c Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ofwoea_machdep.c,v 1.47 2020/02/28 22:14:10 macallan Exp $ */
+/* $NetBSD: ofwoea_machdep.c,v 1.48 2020/07/06 09:34:17 rin Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,15 +30,20 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.47 2020/02/28 22:14:10 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.48 2020/07/06 09:34:17 rin Exp $");
-#include "opt_ppcarch.h"
-#include "opt_compat_netbsd.h"
+#include "ksyms.h"
+#include "wsdisplay.h"
+
+#ifdef _KERNEL_OPT
#include "opt_ddb.h"
+#include "opt_compat_netbsd.h"
#include "opt_kgdb.h"
#include "opt_modular.h"
-
-#include "wsdisplay.h"
+#include "opt_oea.h"
+#include "opt_ofwoea.h"
+#include "opt_ppcarch.h"
+#endif
#include <sys/param.h>
#include <sys/buf.h>
@@ -67,10 +72,6 @@ __KERNEL_RCSID(0, "$NetBSD: ofwoea_machd
#include <powerpc/spr.h>
#include <powerpc/pic/picvar.h>
-#include "opt_oea.h"
-
-#include "ksyms.h"
-
#ifdef DDB
#include <machine/db_machdep.h>
#include <ddb/db_extern.h>
@@ -80,8 +81,6 @@ __KERNEL_RCSID(0, "$NetBSD: ofwoea_machd
#include <sys/kgdb.h>
#endif
-#include "opt_ofwoea.h"
-
#ifdef ofppc
extern struct model_data modeldata;
#endif
Index: src/sys/arch/powerpc/oea/pmap.c
diff -u src/sys/arch/powerpc/oea/pmap.c:1.97 src/sys/arch/powerpc/oea/pmap.c:1.98
--- src/sys/arch/powerpc/oea/pmap.c:1.97 Thu Jul 2 10:28:11 2020
+++ src/sys/arch/powerpc/oea/pmap.c Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.97 2020/07/02 10:28:11 rin Exp $ */
+/* $NetBSD: pmap.c,v 1.98 2020/07/06 09:34:17 rin Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -63,14 +63,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.97 2020/07/02 10:28:11 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.98 2020/07/06 09:34:17 rin Exp $");
#define PMAP_NOOPNAMES
-#include "opt_ppcarch.h"
+#ifdef _KERNEL_OPT
#include "opt_altivec.h"
#include "opt_multiprocessor.h"
#include "opt_pmap.h"
+#include "opt_ppcarch.h"
+#endif
#include <sys/param.h>
#include <sys/proc.h>
Index: src/sys/arch/powerpc/oea/pmap_kernel.c
diff -u src/sys/arch/powerpc/oea/pmap_kernel.c:1.10 src/sys/arch/powerpc/oea/pmap_kernel.c:1.11
--- src/sys/arch/powerpc/oea/pmap_kernel.c:1.10 Sat Jul 28 23:11:01 2012
+++ src/sys/arch/powerpc/oea/pmap_kernel.c Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_kernel.c,v 1.10 2012/07/28 23:11:01 matt Exp $ */
+/* $NetBSD: pmap_kernel.c,v 1.11 2020/07/06 09:34:17 rin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -30,11 +30,13 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: pmap_kernel.c,v 1.10 2012/07/28 23:11:01 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pmap_kernel.c,v 1.11 2020/07/06 09:34:17 rin Exp $");
+#ifdef _KERNEL_OPT
#include "opt_altivec.h"
#include "opt_ddb.h"
#include "opt_pmap.h"
+#endif
#include <sys/param.h>
#include <uvm/uvm_extern.h>
Index: src/sys/arch/powerpc/oea/prep_machdep.c
diff -u src/sys/arch/powerpc/oea/prep_machdep.c:1.11 src/sys/arch/powerpc/oea/prep_machdep.c:1.12
--- src/sys/arch/powerpc/oea/prep_machdep.c:1.11 Thu Dec 22 14:47:58 2016
+++ src/sys/arch/powerpc/oea/prep_machdep.c Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: prep_machdep.c,v 1.11 2016/12/22 14:47:58 cherry Exp $ */
+/* $NetBSD: prep_machdep.c,v 1.12 2020/07/06 09:34:17 rin Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -37,9 +37,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: prep_machdep.c,v 1.11 2016/12/22 14:47:58 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: prep_machdep.c,v 1.12 2020/07/06 09:34:17 rin Exp $");
+#include "ksyms.h"
+
+#ifdef _KERNEL_OPT
+#include "opt_ddb.h"
#include "opt_modular.h"
+#endif
#include <sys/param.h>
#include <sys/extent.h>
@@ -53,14 +58,11 @@ __KERNEL_RCSID(0, "$NetBSD: prep_machdep
#include <machine/pmap.h>
#include <powerpc/oea/bat.h>
-#include "opt_ddb.h"
#ifdef DDB
#include <machine/db_machdep.h>
#include <ddb/db_extern.h>
#endif
-#include "ksyms.h"
-
#if NKSYMS || defined(DDB) || defined(MODULAR)
extern void *endsym, *startsym;
#endif
Index: src/sys/arch/powerpc/pci/pchb.c
diff -u src/sys/arch/powerpc/pci/pchb.c:1.9 src/sys/arch/powerpc/pci/pchb.c:1.10
--- src/sys/arch/powerpc/pci/pchb.c:1.9 Mon Jan 23 16:22:57 2012
+++ src/sys/arch/powerpc/pci/pchb.c Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pchb.c,v 1.9 2012/01/23 16:22:57 phx Exp $ */
+/* $NetBSD: pchb.c,v 1.10 2020/07/06 09:34:17 rin Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.9 2012/01/23 16:22:57 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.10 2020/07/06 09:34:17 rin Exp $");
+
+#include "agp.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -50,8 +52,6 @@ __KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.9
#include <dev/ic/mpc106reg.h>
#include <dev/ic/ibm82660reg.h>
-#include "agp.h"
-
int pchbmatch(device_t, cfdata_t, void *);
void pchbattach(device_t, device_t, void *);
Index: src/sys/arch/powerpc/pci/pci_machdep_common.c
diff -u src/sys/arch/powerpc/pci/pci_machdep_common.c:1.23 src/sys/arch/powerpc/pci/pci_machdep_common.c:1.24
--- src/sys/arch/powerpc/pci/pci_machdep_common.c:1.23 Fri Mar 2 19:36:19 2018
+++ src/sys/arch/powerpc/pci/pci_machdep_common.c Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep_common.c,v 1.23 2018/03/02 19:36:19 macallan Exp $ */
+/* $NetBSD: pci_machdep_common.c,v 1.24 2020/07/06 09:34:17 rin Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -36,11 +36,11 @@
* and call those instead where appropriate.
*/
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep_common.c,v 1.23 2018/03/02 19:36:19 macallan Exp $");
-
#define _POWERPC_BUS_DMA_PRIVATE
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep_common.c,v 1.24 2020/07/06 09:34:17 rin Exp $");
+
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/device.h>
Index: src/sys/arch/powerpc/pci/pci_module.c
diff -u src/sys/arch/powerpc/pci/pci_module.c:1.1 src/sys/arch/powerpc/pci/pci_module.c:1.2
--- src/sys/arch/powerpc/pci/pci_module.c:1.1 Wed Jun 22 18:20:59 2011
+++ src/sys/arch/powerpc/pci/pci_module.c Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_module.c,v 1.1 2011/06/22 18:20:59 matt Exp $ */
+/* $NetBSD: pci_module.c,v 1.2 2020/07/06 09:34:17 rin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -35,11 +35,11 @@
* modules. This keeps pci_chipset_tag_t opaque for modules.
*/
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_module.c,v 1.1 2011/06/22 18:20:59 matt Exp $");
-
#define __PCI_NOINLINE
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: pci_module.c,v 1.2 2020/07/06 09:34:17 rin Exp $");
+
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/device.h>
Index: src/sys/arch/powerpc/pci/pcib.c
diff -u src/sys/arch/powerpc/pci/pcib.c:1.7 src/sys/arch/powerpc/pci/pcib.c:1.8
--- src/sys/arch/powerpc/pci/pcib.c:1.7 Fri Jul 1 18:59:19 2011
+++ src/sys/arch/powerpc/pci/pcib.c Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.7 2011/07/01 18:59:19 dyoung Exp $ */
+/* $NetBSD: pcib.c,v 1.8 2020/07/06 09:34:17 rin Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.7 2011/07/01 18:59:19 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.8 2020/07/06 09:34:17 rin Exp $");
+
+#include "isa.h"
+#include "isadma.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -46,9 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.7
#include <dev/pci/pcidevs.h>
-#include "isa.h"
-#include "isadma.h"
-
int pcibmatch(device_t, cfdata_t, void *);
void pcibattach(device_t, device_t, void *);
Index: src/sys/arch/powerpc/pci/pciconf_ofmethod.c
diff -u src/sys/arch/powerpc/pci/pciconf_ofmethod.c:1.5 src/sys/arch/powerpc/pci/pciconf_ofmethod.c:1.6
--- src/sys/arch/powerpc/pci/pciconf_ofmethod.c:1.5 Fri Oct 2 05:22:52 2015
+++ src/sys/arch/powerpc/pci/pciconf_ofmethod.c Mon Jul 6 09:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pciconf_ofmethod.c,v 1.5 2015/10/02 05:22:52 msaitoh Exp $ */
+/* $NetBSD: pciconf_ofmethod.c,v 1.6 2020/07/06 09:34:17 rin Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -34,11 +34,11 @@
* OF methods of the device.
*/
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciconf_ofmethod.c,v 1.5 2015/10/02 05:22:52 msaitoh Exp $");
-
#define _POWERPC_BUS_DMA_PRIVATE
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: pciconf_ofmethod.c,v 1.6 2020/07/06 09:34:17 rin Exp $");
+
#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
Index: src/sys/arch/powerpc/pic/intr.c
diff -u src/sys/arch/powerpc/pic/intr.c:1.27 src/sys/arch/powerpc/pic/intr.c:1.28
--- src/sys/arch/powerpc/pic/intr.c:1.27 Thu Feb 20 05:10:01 2020
+++ src/sys/arch/powerpc/pic/intr.c Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.27 2020/02/20 05:10:01 rin Exp $ */
+/* $NetBSD: intr.c,v 1.28 2020/07/06 09:34:18 rin Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -26,14 +26,16 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#define __INTR_PRIVATE
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.27 2020/02/20 05:10:01 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.28 2020/07/06 09:34:18 rin Exp $");
+#ifdef _KERNEL_OPT
#include "opt_interrupt.h"
#include "opt_multiprocessor.h"
#include "opt_pic.h"
-
-#define __INTR_PRIVATE
+#endif
#include <sys/param.h>
#include <sys/cpu.h>
Index: src/sys/arch/powerpc/pic/ipi.c
diff -u src/sys/arch/powerpc/pic/ipi.c:1.14 src/sys/arch/powerpc/pic/ipi.c:1.15
--- src/sys/arch/powerpc/pic/ipi.c:1.14 Sun Dec 1 15:34:45 2019
+++ src/sys/arch/powerpc/pic/ipi.c Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ipi.c,v 1.14 2019/12/01 15:34:45 ad Exp $ */
+/* $NetBSD: ipi.c,v 1.15 2020/07/06 09:34:18 rin Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,12 +29,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipi.c,v 1.14 2019/12/01 15:34:45 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipi.c,v 1.15 2020/07/06 09:34:18 rin Exp $");
+#ifdef _KERNEL_OPT
+#include "opt_altivec.h"
+#include "opt_interrupt.h"
+#include "opt_ipi.h"
#include "opt_multiprocessor.h"
#include "opt_pic.h"
-#include "opt_interrupt.h"
-#include "opt_altivec.h"
+#endif
#include <sys/param.h>
#include <sys/kernel.h>
@@ -47,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: ipi.c,v 1.14
#include <powerpc/pic/picvar.h>
#include <powerpc/pic/ipivar.h>
-#include "opt_ipi.h"
#ifdef MULTIPROCESSOR
Index: src/sys/arch/powerpc/pic/ipi_openpic.c
diff -u src/sys/arch/powerpc/pic/ipi_openpic.c:1.8 src/sys/arch/powerpc/pic/ipi_openpic.c:1.9
--- src/sys/arch/powerpc/pic/ipi_openpic.c:1.8 Thu May 26 17:38:05 2016
+++ src/sys/arch/powerpc/pic/ipi_openpic.c Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ipi_openpic.c,v 1.8 2016/05/26 17:38:05 macallan Exp $ */
+/* $NetBSD: ipi_openpic.c,v 1.9 2020/07/06 09:34:18 rin Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,9 +29,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipi_openpic.c,v 1.8 2016/05/26 17:38:05 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipi_openpic.c,v 1.9 2020/07/06 09:34:18 rin Exp $");
+#ifdef _KERNEL_OPT
#include "opt_multiprocessor.h"
+#endif
+
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/atomic.h>
Index: src/sys/arch/powerpc/pic/openpic_common.c
diff -u src/sys/arch/powerpc/pic/openpic_common.c:1.7 src/sys/arch/powerpc/pic/openpic_common.c:1.8
--- src/sys/arch/powerpc/pic/openpic_common.c:1.7 Thu Sep 19 23:28:52 2013
+++ src/sys/arch/powerpc/pic/openpic_common.c Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: openpic_common.c,v 1.7 2013/09/19 23:28:52 christos Exp $ */
+/* $NetBSD: openpic_common.c,v 1.8 2020/07/06 09:34:18 rin Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,10 +27,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: openpic_common.c,v 1.7 2013/09/19 23:28:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: openpic_common.c,v 1.8 2020/07/06 09:34:18 rin Exp $");
-#include "opt_openpic.h"
+#ifdef _KERNEL_OPT
#include "opt_interrupt.h"
+#include "opt_openpic.h"
+#endif
#include <sys/param.h>
#include <sys/kernel.h>
Index: src/sys/arch/powerpc/pic/pic_mpcsoc.c
diff -u src/sys/arch/powerpc/pic/pic_mpcsoc.c:1.7 src/sys/arch/powerpc/pic/pic_mpcsoc.c:1.8
--- src/sys/arch/powerpc/pic/pic_mpcsoc.c:1.7 Mon Sep 3 16:29:26 2018
+++ src/sys/arch/powerpc/pic/pic_mpcsoc.c Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_mpcsoc.c,v 1.7 2018/09/03 16:29:26 riastradh Exp $ */
+/* $NetBSD: pic_mpcsoc.c,v 1.8 2020/07/06 09:34:18 rin Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_mpcsoc.c,v 1.7 2018/09/03 16:29:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_mpcsoc.c,v 1.8 2020/07/06 09:34:18 rin Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_interrupt.h"
+#endif
#include <sys/param.h>
#include <sys/kmem.h>
@@ -40,8 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: pic_mpcsoc.c
#include <powerpc/pic/picvar.h>
-#include "opt_interrupt.h"
-
static void mpcpic_enable_irq(struct pic_ops *, int, int);
static void mpcpic_disable_irq(struct pic_ops *, int);
static void mpcpic_establish_irq(struct pic_ops *, int, int, int);
Index: src/sys/arch/powerpc/pic/pic_distopenpic.c
diff -u src/sys/arch/powerpc/pic/pic_distopenpic.c:1.11 src/sys/arch/powerpc/pic/pic_distopenpic.c:1.12
--- src/sys/arch/powerpc/pic/pic_distopenpic.c:1.11 Mon Sep 3 16:29:26 2018
+++ src/sys/arch/powerpc/pic/pic_distopenpic.c Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_distopenpic.c,v 1.11 2018/09/03 16:29:26 riastradh Exp $ */
+/* $NetBSD: pic_distopenpic.c,v 1.12 2020/07/06 09:34:18 rin Exp $ */
/*-
* Copyright (c) 2008 Tim Rightnour
@@ -30,10 +30,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_distopenpic.c,v 1.11 2018/09/03 16:29:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_distopenpic.c,v 1.12 2020/07/06 09:34:18 rin Exp $");
-#include "opt_openpic.h"
+#ifdef _KERNEL_OPT
#include "opt_interrupt.h"
+#include "opt_openpic.h"
+#endif
#include <sys/param.h>
#include <sys/kernel.h>
Index: src/sys/arch/powerpc/pic/pic_openpic.c
diff -u src/sys/arch/powerpc/pic/pic_openpic.c:1.15 src/sys/arch/powerpc/pic/pic_openpic.c:1.16
--- src/sys/arch/powerpc/pic/pic_openpic.c:1.15 Mon Sep 3 16:29:26 2018
+++ src/sys/arch/powerpc/pic/pic_openpic.c Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_openpic.c,v 1.15 2018/09/03 16:29:26 riastradh Exp $ */
+/* $NetBSD: pic_openpic.c,v 1.16 2020/07/06 09:34:18 rin Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_openpic.c,v 1.15 2018/09/03 16:29:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_openpic.c,v 1.16 2020/07/06 09:34:18 rin Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_interrupt.h"
+#endif
#include <sys/param.h>
#include <sys/kmem.h>
@@ -40,8 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: pic_openpic.
#include <powerpc/pic/picvar.h>
-#include "opt_interrupt.h"
-
static void opic_enable_irq(struct pic_ops *, int, int);
static void opic_disable_irq(struct pic_ops *, int);
static void opic_establish_irq(struct pic_ops*, int, int, int);
Index: src/sys/arch/powerpc/powerpc/bus_dma.c
diff -u src/sys/arch/powerpc/powerpc/bus_dma.c:1.50 src/sys/arch/powerpc/powerpc/bus_dma.c:1.51
--- src/sys/arch/powerpc/powerpc/bus_dma.c:1.50 Thu Feb 20 05:10:02 2020
+++ src/sys/arch/powerpc/powerpc/bus_dma.c Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.50 2020/02/20 05:10:02 rin Exp $ */
+/* $NetBSD: bus_dma.c,v 1.51 2020/07/06 09:34:18 rin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,8 +31,9 @@
*/
#define _POWERPC_BUS_DMA_PRIVATE
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.50 2020/02/20 05:10:02 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.51 2020/07/06 09:34:18 rin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/powerpc/powerpc/bus_space.c
diff -u src/sys/arch/powerpc/powerpc/bus_space.c:1.36 src/sys/arch/powerpc/powerpc/bus_space.c:1.37
--- src/sys/arch/powerpc/powerpc/bus_space.c:1.36 Tue Jul 9 20:33:03 2013
+++ src/sys/arch/powerpc/powerpc/bus_space.c Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.36 2013/07/09 20:33:03 matt Exp $ */
+/* $NetBSD: bus_space.c,v 1.37 2020/07/06 09:34:18 rin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -30,11 +30,11 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.36 2013/07/09 20:33:03 matt Exp $");
-
#define _POWERPC_BUS_SPACE_PRIVATE
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.37 2020/07/06 09:34:18 rin Exp $");
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
Index: src/sys/arch/powerpc/powerpc/compat_16_machdep.c
diff -u src/sys/arch/powerpc/powerpc/compat_16_machdep.c:1.19 src/sys/arch/powerpc/powerpc/compat_16_machdep.c:1.20
--- src/sys/arch/powerpc/powerpc/compat_16_machdep.c:1.19 Mon Jun 20 05:50:39 2011
+++ src/sys/arch/powerpc/powerpc/compat_16_machdep.c Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_16_machdep.c,v 1.19 2011/06/20 05:50:39 matt Exp $ */
+/* $NetBSD: compat_16_machdep.c,v 1.20 2020/07/06 09:34:18 rin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,11 +32,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.19 2011/06/20 05:50:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.20 2020/07/06 09:34:18 rin Exp $");
#ifdef _KERNEL_OPT
-#include "opt_compat_netbsd.h"
#include "opt_altivec.h"
+#include "opt_compat_netbsd.h"
#include "opt_ppcarch.h"
#endif
Index: src/sys/arch/powerpc/powerpc/db_interface.c
diff -u src/sys/arch/powerpc/powerpc/db_interface.c:1.53 src/sys/arch/powerpc/powerpc/db_interface.c:1.54
--- src/sys/arch/powerpc/powerpc/db_interface.c:1.53 Fri Jan 23 07:27:05 2015
+++ src/sys/arch/powerpc/powerpc/db_interface.c Mon Jul 6 09:34:18 2020
@@ -1,15 +1,17 @@
-/* $NetBSD: db_interface.c,v 1.53 2015/01/23 07:27:05 nonaka Exp $ */
+/* $NetBSD: db_interface.c,v 1.54 2020/07/06 09:34:18 rin Exp $ */
/* $OpenBSD: db_interface.c,v 1.2 1996/12/28 06:21:50 rahnds Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.53 2015/01/23 07:27:05 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.54 2020/07/06 09:34:18 rin Exp $");
#define USERACC
+#ifdef _KERNEL_OPT
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_multiprocessor.h"
#include "opt_ppcarch.h"
+#endif
#include <sys/param.h>
#include <sys/proc.h>
Index: src/sys/arch/powerpc/powerpc/db_trace.c
diff -u src/sys/arch/powerpc/powerpc/db_trace.c:1.59 src/sys/arch/powerpc/powerpc/db_trace.c:1.60
--- src/sys/arch/powerpc/powerpc/db_trace.c:1.59 Mon Jul 6 08:30:10 2020
+++ src/sys/arch/powerpc/powerpc/db_trace.c Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.59 2020/07/06 08:30:10 rin Exp $ */
+/* $NetBSD: db_trace.c,v 1.60 2020/07/06 09:34:18 rin Exp $ */
/* $OpenBSD: db_trace.c,v 1.3 1997/03/21 02:10:48 niklas Exp $ */
/*
@@ -28,9 +28,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.59 2020/07/06 08:30:10 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.60 2020/07/06 09:34:18 rin Exp $");
+#ifdef _KERNEL_OPT
#include "opt_ppcarch.h"
+#endif
#include <sys/param.h>
#include <sys/proc.h>
Index: src/sys/arch/powerpc/powerpc/fixup.c
diff -u src/sys/arch/powerpc/powerpc/fixup.c:1.10 src/sys/arch/powerpc/powerpc/fixup.c:1.11
--- src/sys/arch/powerpc/powerpc/fixup.c:1.10 Sat Aug 2 15:58:04 2014
+++ src/sys/arch/powerpc/powerpc/fixup.c Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fixup.c,v 1.10 2014/08/02 15:58:04 joerg Exp $ */
+/* $NetBSD: fixup.c,v 1.11 2020/07/06 09:34:18 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,8 +35,7 @@
*/
#include <sys/cdefs.h>
-
-__KERNEL_RCSID(0, "$NetBSD: fixup.c,v 1.10 2014/08/02 15:58:04 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fixup.c,v 1.11 2020/07/06 09:34:18 rin Exp $");
#include <sys/param.h>
#include <sys/types.h>
Index: src/sys/arch/powerpc/powerpc/fpu.c
diff -u src/sys/arch/powerpc/powerpc/fpu.c:1.39 src/sys/arch/powerpc/powerpc/fpu.c:1.40
--- src/sys/arch/powerpc/powerpc/fpu.c:1.39 Thu Feb 20 06:12:47 2020
+++ src/sys/arch/powerpc/powerpc/fpu.c Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.39 2020/02/20 06:12:47 rin Exp $ */
+/* $NetBSD: fpu.c,v 1.40 2020/07/06 09:34:18 rin Exp $ */
/*
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -32,9 +32,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.39 2020/02/20 06:12:47 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.40 2020/07/06 09:34:18 rin Exp $");
+#ifdef _KERNEL_OPT
#include "opt_multiprocessor.h"
+#endif
#include <sys/param.h>
#include <sys/proc.h>
Index: src/sys/arch/powerpc/powerpc/intr_stubs.c
diff -u src/sys/arch/powerpc/powerpc/intr_stubs.c:1.6 src/sys/arch/powerpc/powerpc/intr_stubs.c:1.7
--- src/sys/arch/powerpc/powerpc/intr_stubs.c:1.6 Mon Jul 6 08:10:57 2020
+++ src/sys/arch/powerpc/powerpc/intr_stubs.c Mon Jul 6 09:34:18 2020
@@ -37,8 +37,7 @@
#define __INTR_NOINLINE
#include <sys/cdefs.h>
-
-__KERNEL_RCSID(0, "$NetBSD: intr_stubs.c,v 1.6 2020/07/06 08:10:57 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr_stubs.c,v 1.7 2020/07/06 09:34:18 rin Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
Index: src/sys/arch/powerpc/powerpc/kgdb_machdep.c
diff -u src/sys/arch/powerpc/powerpc/kgdb_machdep.c:1.22 src/sys/arch/powerpc/powerpc/kgdb_machdep.c:1.23
--- src/sys/arch/powerpc/powerpc/kgdb_machdep.c:1.22 Tue Mar 2 21:53:20 2010
+++ src/sys/arch/powerpc/powerpc/kgdb_machdep.c Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kgdb_machdep.c,v 1.22 2010/03/02 21:53:20 matt Exp $ */
+/* $NetBSD: kgdb_machdep.c,v 1.23 2020/07/06 09:34:18 rin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -36,9 +36,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.22 2010/03/02 21:53:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.23 2020/07/06 09:34:18 rin Exp $");
+#ifdef _KERNEL_OPT
#include "opt_ddb.h"
+#endif
/*
* Machine-dependent functions for remote KGDB.
Index: src/sys/arch/powerpc/powerpc/linux_syscall.c
diff -u src/sys/arch/powerpc/powerpc/linux_syscall.c:1.5 src/sys/arch/powerpc/powerpc/linux_syscall.c:1.6
--- src/sys/arch/powerpc/powerpc/linux_syscall.c:1.5 Mon Apr 28 20:23:32 2008
+++ src/sys/arch/powerpc/powerpc/linux_syscall.c Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_syscall.c,v 1.5 2008/04/28 20:23:32 martin Exp $ */
+/* $NetBSD: linux_syscall.c,v 1.6 2020/07/06 09:34:18 rin Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -29,10 +29,12 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include "opt_compat_linux.h"
#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: linux_syscall.c,v 1.6 2020/07/06 09:34:18 rin Exp $");
-__KERNEL_RCSID(0, "$NetBSD: linux_syscall.c,v 1.5 2008/04/28 20:23:32 martin Exp $");
+#ifdef _KERNEL_OPT
+#include "opt_compat_linux.h"
+#endif
#include <sys/types.h>
#include <sys/param.h>
Index: src/sys/arch/powerpc/powerpc/lock_stubs.S
diff -u src/sys/arch/powerpc/powerpc/lock_stubs.S:1.12 src/sys/arch/powerpc/powerpc/lock_stubs.S:1.13
--- src/sys/arch/powerpc/powerpc/lock_stubs.S:1.12 Sun Mar 1 23:23:36 2020
+++ src/sys/arch/powerpc/powerpc/lock_stubs.S Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lock_stubs.S,v 1.12 2020/03/01 23:23:36 rin Exp $ */
+/* $NetBSD: lock_stubs.S,v 1.13 2020/07/06 09:34:18 rin Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -29,13 +29,15 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include "opt_multiprocessor.h"
-#include "opt_lockdebug.h"
-
#include <machine/asm.h>
#include "assym.h"
+#ifdef _KERNEL_OPT
+#include "opt_multiprocessor.h"
+#include "opt_lockdebug.h"
+#endif
+
#if defined(MULTIPROCESSOR)
#define ISYNC isync
#define SYNC sync
Index: src/sys/arch/powerpc/powerpc/locore_subr.S
diff -u src/sys/arch/powerpc/powerpc/locore_subr.S:1.61 src/sys/arch/powerpc/powerpc/locore_subr.S:1.62
--- src/sys/arch/powerpc/powerpc/locore_subr.S:1.61 Sun Mar 1 23:23:36 2020
+++ src/sys/arch/powerpc/powerpc/locore_subr.S Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: locore_subr.S,v 1.61 2020/03/01 23:23:36 rin Exp $ */
+/* $NetBSD: locore_subr.S,v 1.62 2020/07/06 09:34:18 rin Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -73,11 +73,13 @@
* #include <powerpc/powerpc/locore_subr.S>
*/
-#include "opt_ppcarch.h"
-#include "opt_lockdebug.h"
-#include "opt_multiprocessor.h"
+#ifdef _KERNEL_OPT
#include "opt_ddb.h"
+#include "opt_lockdebug.h"
#include "opt_modular.h"
+#include "opt_multiprocessor.h"
+#include "opt_ppcarch.h"
+#endif
#ifdef DDB
#define CFRAME_LRSAVE(t0) \
Index: src/sys/arch/powerpc/powerpc/ofwreal.S
diff -u src/sys/arch/powerpc/powerpc/ofwreal.S:1.14 src/sys/arch/powerpc/powerpc/ofwreal.S:1.15
--- src/sys/arch/powerpc/powerpc/ofwreal.S:1.14 Mon Dec 31 18:47:46 2018
+++ src/sys/arch/powerpc/powerpc/ofwreal.S Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ofwreal.S,v 1.14 2018/12/31 18:47:46 christos Exp $ */
+/* $NetBSD: ofwreal.S,v 1.15 2020/07/06 09:34:18 rin Exp $ */
/*
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -42,6 +42,7 @@
*
* TODO: handle set-callback specially
*/
+
#include <machine/psl.h>
#include <machine/trap.h>
#include <machine/asm.h>
Index: src/sys/arch/powerpc/powerpc/openfirm.c
diff -u src/sys/arch/powerpc/powerpc/openfirm.c:1.30 src/sys/arch/powerpc/powerpc/openfirm.c:1.31
--- src/sys/arch/powerpc/powerpc/openfirm.c:1.30 Fri Dec 6 06:38:39 2019
+++ src/sys/arch/powerpc/powerpc/openfirm.c Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: openfirm.c,v 1.30 2019/12/06 06:38:39 mrg Exp $ */
+/* $NetBSD: openfirm.c,v 1.31 2020/07/06 09:34:18 rin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -31,10 +31,12 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "opt_multiprocessor.h"
-
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: openfirm.c,v 1.30 2019/12/06 06:38:39 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: openfirm.c,v 1.31 2020/07/06 09:34:18 rin Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_multiprocessor.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/powerpc/powerpc/pmap_subr.c
diff -u src/sys/arch/powerpc/powerpc/pmap_subr.c:1.28 src/sys/arch/powerpc/powerpc/pmap_subr.c:1.29
--- src/sys/arch/powerpc/powerpc/pmap_subr.c:1.28 Fri May 11 22:23:33 2018
+++ src/sys/arch/powerpc/powerpc/pmap_subr.c Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_subr.c,v 1.28 2018/05/11 22:23:33 macallan Exp $ */
+/* $NetBSD: pmap_subr.c,v 1.29 2020/07/06 09:34:18 rin Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,11 +29,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_subr.c,v 1.28 2018/05/11 22:23:33 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_subr.c,v 1.29 2020/07/06 09:34:18 rin Exp $");
-#include "opt_multiprocessor.h"
+#ifdef _KERNEL_OPT
#include "opt_altivec.h"
+#include "opt_multiprocessor.h"
#include "opt_pmap.h"
+#endif
+
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/sched.h>
Index: src/sys/arch/powerpc/powerpc/powerpc_machdep.c
diff -u src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.77 src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.78
--- src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.77 Thu Feb 20 06:12:47 2020
+++ src/sys/arch/powerpc/powerpc/powerpc_machdep.c Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: powerpc_machdep.c,v 1.77 2020/02/20 06:12:47 rin Exp $ */
+/* $NetBSD: powerpc_machdep.c,v 1.78 2020/07/06 09:34:18 rin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,13 +32,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: powerpc_machdep.c,v 1.77 2020/02/20 06:12:47 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: powerpc_machdep.c,v 1.78 2020/07/06 09:34:18 rin Exp $");
+#ifdef _KERNEL_OPT
#include "opt_altivec.h"
#include "opt_ddb.h"
#include "opt_modular.h"
#include "opt_multiprocessor.h"
#include "opt_ppcarch.h"
+#endif
#include <sys/param.h>
#include <sys/conf.h>
Index: src/sys/arch/powerpc/powerpc/process_machdep.c
diff -u src/sys/arch/powerpc/powerpc/process_machdep.c:1.38 src/sys/arch/powerpc/powerpc/process_machdep.c:1.39
--- src/sys/arch/powerpc/powerpc/process_machdep.c:1.38 Thu Mar 16 16:13:20 2017
+++ src/sys/arch/powerpc/powerpc/process_machdep.c Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: process_machdep.c,v 1.38 2017/03/16 16:13:20 chs Exp $ */
+/* $NetBSD: process_machdep.c,v 1.39 2020/07/06 09:34:18 rin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,9 +32,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.38 2017/03/16 16:13:20 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.39 2020/07/06 09:34:18 rin Exp $");
+#ifdef _KERNEL_OPT
#include "opt_altivec.h"
+#endif
#include <sys/param.h>
#include <sys/cpu.h>
Index: src/sys/arch/powerpc/powerpc/setfault.S
diff -u src/sys/arch/powerpc/powerpc/setfault.S:1.9 src/sys/arch/powerpc/powerpc/setfault.S:1.10
--- src/sys/arch/powerpc/powerpc/setfault.S:1.9 Fri Jun 17 05:07:17 2011
+++ src/sys/arch/powerpc/powerpc/setfault.S Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: setfault.S,v 1.9 2011/06/17 05:07:17 matt Exp $ */
+/* $NetBSD: setfault.S,v 1.10 2020/07/06 09:34:18 rin Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -65,8 +65,13 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "opt_ppcarch.h"
+
#include "assym.h"
+
+#ifdef _KERNEL_OPT
+#include "opt_ppcarch.h"
+#endif
+
#include <machine/asm.h>
#include <machine/psl.h>
Index: src/sys/arch/powerpc/powerpc/sig_machdep.c
diff -u src/sys/arch/powerpc/powerpc/sig_machdep.c:1.51 src/sys/arch/powerpc/powerpc/sig_machdep.c:1.52
--- src/sys/arch/powerpc/powerpc/sig_machdep.c:1.51 Mon Jun 22 05:34:57 2020
+++ src/sys/arch/powerpc/powerpc/sig_machdep.c Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.51 2020/06/22 05:34:57 rin Exp $ */
+/* $NetBSD: sig_machdep.c,v 1.52 2020/07/06 09:34:18 rin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,10 +32,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.51 2020/06/22 05:34:57 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.52 2020/07/06 09:34:18 rin Exp $");
-#include "opt_ppcarch.h"
+#ifdef _KERNEL_OPT
#include "opt_altivec.h"
+#include "opt_ppcarch.h"
+#endif
#include <sys/param.h>
#include <sys/mount.h>
Index: src/sys/arch/powerpc/powerpc/syscall.c
diff -u src/sys/arch/powerpc/powerpc/syscall.c:1.55 src/sys/arch/powerpc/powerpc/syscall.c:1.56
--- src/sys/arch/powerpc/powerpc/syscall.c:1.55 Sat Apr 6 11:54:20 2019
+++ src/sys/arch/powerpc/powerpc/syscall.c Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.c,v 1.55 2019/04/06 11:54:20 kamil Exp $ */
+/* $NetBSD: syscall.c,v 1.56 2020/07/06 09:34:18 rin Exp $ */
/*
* Copyright (C) 2002 Matt Thomas
@@ -32,11 +32,14 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "opt_altivec.h"
-#include "opt_multiprocessor.h"
/* DO NOT INCLUDE opt_compat_XXX.h */
/* If needed, they will be included by file that includes this one */
+#ifdef _KERNEL_OPT
+#include "opt_altivec.h"
+#include "opt_multiprocessor.h"
+#endif
+
#include <sys/param.h>
#include <sys/cpu.h>
#include <sys/ktrace.h>
@@ -61,7 +64,7 @@
#define EMULNAME(x) (x)
#define EMULNAMEU(x) (x)
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.55 2019/04/06 11:54:20 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.56 2020/07/06 09:34:18 rin Exp $");
void
md_child_return(struct lwp *l)
Index: src/sys/arch/powerpc/powerpc/trap.c
diff -u src/sys/arch/powerpc/powerpc/trap.c:1.157 src/sys/arch/powerpc/powerpc/trap.c:1.158
--- src/sys/arch/powerpc/powerpc/trap.c:1.157 Tue Feb 25 00:42:12 2020
+++ src/sys/arch/powerpc/powerpc/trap.c Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.157 2020/02/25 00:42:12 rin Exp $ */
+/* $NetBSD: trap.c,v 1.158 2020/07/06 09:34:18 rin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -31,15 +31,17 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#define __UFETCHSTORE_PRIVATE
+#define __UCAS_PRIVATE
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.157 2020/02/25 00:42:12 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.158 2020/07/06 09:34:18 rin Exp $");
+#ifdef _KERNEL_OPT
#include "opt_altivec.h"
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
-
-#define __UFETCHSTORE_PRIVATE
-#define __UCAS_PRIVATE
+#endif
#include <sys/param.h>
Index: src/sys/arch/powerpc/powerpc/trap_subr.S
diff -u src/sys/arch/powerpc/powerpc/trap_subr.S:1.81 src/sys/arch/powerpc/powerpc/trap_subr.S:1.82
--- src/sys/arch/powerpc/powerpc/trap_subr.S:1.81 Sun Mar 1 23:23:36 2020
+++ src/sys/arch/powerpc/powerpc/trap_subr.S Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: trap_subr.S,v 1.81 2020/03/01 23:23:36 rin Exp $ */
+/* $NetBSD: trap_subr.S,v 1.82 2020/07/06 09:34:18 rin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -37,7 +37,10 @@
*
* #include <powerpc/powerpc/trap_subr.S>
*/
+
+#ifdef _KERNEL_OPT
#include "opt_altivec.h"
+#endif
/* LINTSTUB: include <sys/param.h> */
/* LINTSTUB: include <powerpc/oea/bat.h> */
Index: src/sys/arch/powerpc/powerpc/vm_machdep.c
diff -u src/sys/arch/powerpc/powerpc/vm_machdep.c:1.102 src/sys/arch/powerpc/powerpc/vm_machdep.c:1.103
--- src/sys/arch/powerpc/powerpc/vm_machdep.c:1.102 Mon Feb 24 11:49:17 2020
+++ src/sys/arch/powerpc/powerpc/vm_machdep.c Mon Jul 6 09:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.102 2020/02/24 11:49:17 rin Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.103 2020/07/06 09:34:18 rin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,12 +32,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.102 2020/02/24 11:49:17 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.103 2020/07/06 09:34:18 rin Exp $");
+#ifdef _KERNEL_OPT
#include "opt_altivec.h"
#include "opt_multiprocessor.h"
#include "opt_ppcarch.h"
#include "opt_ppccache.h"
+#endif
#include <sys/param.h>
#include <sys/core.h>
