[src/trunk]: src/sys/arch/powerpc Include missing opt_ppcarch.h.

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

details:   https://anonhg.NetBSD.org/src/rev/94a643ede3ed
branches:  trunk
changeset: 935573:94a643ede3ed
user:      rin <rin%NetBSD.org@localhost>
date:      Mon Jul 06 10:31:23 2020 +0000

description:
Include missing opt_ppcarch.h.

diffstat:

 sys/arch/powerpc/fpu/fpu_emu.c         |   5 +++--
 sys/arch/powerpc/ibm4xx/clock.c        |   8 ++++++--
 sys/arch/powerpc/include/cpu_counter.h |   6 +++++-
 sys/arch/powerpc/include/oea/bat.h     |   6 +++++-
 sys/arch/powerpc/include/oea/hid.h     |   6 +++++-
 sys/arch/powerpc/include/oea/spr.h     |  12 ++++++++----
 sys/arch/powerpc/include/pio.h         |   7 ++++++-
 sys/arch/powerpc/include/spr.h         |   6 +++++-
 sys/arch/powerpc/oea/cpu_subr.c        |   5 +++--
 sys/arch/powerpc/oea/ofw_subr.S        |   5 ++++-
 sys/arch/powerpc/pic/intr.c            |   5 +++--
 sys/arch/powerpc/powerpc/bus_dma.c     |   8 ++++++--
 sys/arch/powerpc/powerpc/bus_space.c   |   8 ++++++--
 sys/arch/powerpc/powerpc/clock.c       |   8 ++++++--
 sys/arch/powerpc/powerpc/db_disasm.c   |   8 ++++++--
 sys/arch/powerpc/powerpc/fixup.c       |   8 ++++++--
 sys/arch/powerpc/powerpc/pio_subr.S    |   7 ++++++-
 sys/arch/powerpc/powerpc/pmap_subr.c   |   5 +++--
 18 files changed, 92 insertions(+), 31 deletions(-)

diffs (truncated from 392 to 300 lines):

diff -r 60ba22d69be5 -r 94a643ede3ed sys/arch/powerpc/fpu/fpu_emu.c
--- a/sys/arch/powerpc/fpu/fpu_emu.c    Mon Jul 06 10:22:44 2020 +0000
+++ b/sys/arch/powerpc/fpu/fpu_emu.c    Mon Jul 06 10:31:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fpu_emu.c,v 1.23 2020/07/06 09:34:16 rin Exp $ */
+/*     $NetBSD: fpu_emu.c,v 1.24 2020/07/06 10:31:23 rin Exp $ */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -76,10 +76,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_emu.c,v 1.23 2020/07/06 09:34:16 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_emu.c,v 1.24 2020/07/06 10:31:23 rin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
+#include "opt_ppcarch.h"
 #endif
 
 #include <sys/param.h>
diff -r 60ba22d69be5 -r 94a643ede3ed sys/arch/powerpc/ibm4xx/clock.c
--- a/sys/arch/powerpc/ibm4xx/clock.c   Mon Jul 06 10:22:44 2020 +0000
+++ b/sys/arch/powerpc/ibm4xx/clock.c   Mon Jul 06 10:31:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.28 2020/05/29 12:30:40 rin Exp $   */
+/*     $NetBSD: clock.c,v 1.29 2020/07/06 10:31:23 rin Exp $   */
 /*      $OpenBSD: clock.c,v 1.3 1997/10/13 13:42:53 pefo Exp $  */
 
 /*
@@ -33,7 +33,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.28 2020/05/29 12:30:40 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.29 2020/07/06 10:31:23 rin Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_ppcarch.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff -r 60ba22d69be5 -r 94a643ede3ed sys/arch/powerpc/include/cpu_counter.h
--- a/sys/arch/powerpc/include/cpu_counter.h    Mon Jul 06 10:22:44 2020 +0000
+++ b/sys/arch/powerpc/include/cpu_counter.h    Mon Jul 06 10:31:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu_counter.h,v 1.8 2011/01/18 01:02:54 matt Exp $     */
+/*     $NetBSD: cpu_counter.h,v 1.9 2020/07/06 10:31:23 rin Exp $      */
 
 /*-
  * Copyright (c) 2000 Tsubai Masanari.  All rights reserved.
@@ -35,6 +35,10 @@
 
 #ifdef _KERNEL
 
+#ifdef _KERNEL_OPT
+#include "opt_ppcarch.h"
+#endif
+
 #include <powerpc/spr.h>
 #ifdef PPC_OEA601
 #include <powerpc/oea/spr.h>
diff -r 60ba22d69be5 -r 94a643ede3ed sys/arch/powerpc/include/oea/bat.h
--- a/sys/arch/powerpc/include/oea/bat.h        Mon Jul 06 10:22:44 2020 +0000
+++ b/sys/arch/powerpc/include/oea/bat.h        Mon Jul 06 10:31:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bat.h,v 1.19 2020/07/06 09:34:17 rin Exp $     */
+/*     $NetBSD: bat.h,v 1.20 2020/07/06 10:31:23 rin Exp $     */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -65,6 +65,10 @@
 
 #if defined(_KERNEL) && !defined(_LOCORE)
 
+#ifdef _KERNEL_OPT
+#include "opt_ppcarch.h"
+#endif
+
 #include <powerpc/psl.h>
 
 struct bat {
diff -r 60ba22d69be5 -r 94a643ede3ed sys/arch/powerpc/include/oea/hid.h
--- a/sys/arch/powerpc/include/oea/hid.h        Mon Jul 06 10:22:44 2020 +0000
+++ b/sys/arch/powerpc/include/oea/hid.h        Mon Jul 06 10:31:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hid.h,v 1.12 2018/02/16 18:04:06 macallan Exp $        */
+/*     $NetBSD: hid.h,v 1.13 2020/07/06 10:31:23 rin Exp $     */
 
 /*-
  * Copyright (c) 2000 Tsubai Masanari.  All rights reserved.
@@ -29,6 +29,10 @@
 #ifndef _POWERPC_OEA_HID_H_
 #define _POWERPC_OEA_HID_H_
 
+#ifdef _KERNEL_OPT
+#include "opt_ppcarch.h"
+#endif
+
 /* Hardware Implementation Dependent registers for the PowerPC */
 
 #if defined(_ARCH_PPC64) || defined (PPC_OEA64_BRIDGE)
diff -r 60ba22d69be5 -r 94a643ede3ed sys/arch/powerpc/include/oea/spr.h
--- a/sys/arch/powerpc/include/oea/spr.h        Mon Jul 06 10:22:44 2020 +0000
+++ b/sys/arch/powerpc/include/oea/spr.h        Mon Jul 06 10:31:23 2020 +0000
@@ -1,16 +1,20 @@
-/*     $NetBSD: spr.h,v 1.6 2018/06/01 18:18:11 macallan Exp $ */
+/*     $NetBSD: spr.h,v 1.7 2020/07/06 10:31:23 rin Exp $      */
 
 #ifndef _POWERPC_OEA_SPR_H_
 #define        _POWERPC_OEA_SPR_H_
 
 #if !defined(_LOCORE) && defined(_KERNEL)
+
+#ifdef _KERNEL_OPT
+#include "opt_ppcarch.h"
+#endif
+
 #if defined(PPC_OEA64_BRIDGE) || defined (_ARCH_PPC64)
-
 #include <powerpc/psl.h>
 #include <powerpc/spr.h>
+#endif
 
-#endif
-#endif
+#endif /* !_LOCORE && _KERNEL */
 
 /*
  * Special Purpose Register declarations.
diff -r 60ba22d69be5 -r 94a643ede3ed sys/arch/powerpc/include/pio.h
--- a/sys/arch/powerpc/include/pio.h    Mon Jul 06 10:22:44 2020 +0000
+++ b/sys/arch/powerpc/include/pio.h    Mon Jul 06 10:31:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pio.h,v 1.8 2020/02/20 05:10:01 rin Exp $ */
+/*     $NetBSD: pio.h,v 1.9 2020/07/06 10:31:23 rin Exp $ */
 /*     $OpenBSD: pio.h,v 1.1 1997/10/13 10:53:47 pefo Exp $ */
 
 /*
@@ -35,6 +35,11 @@
 
 #ifndef _POWERPC_PIO_H_
 #define _POWERPC_PIO_H_
+
+#ifdef _KERNEL_OPT
+#include "opt_ppcarch.h"
+#endif
+
 /*
  * I/O macros.
  */
diff -r 60ba22d69be5 -r 94a643ede3ed sys/arch/powerpc/include/spr.h
--- a/sys/arch/powerpc/include/spr.h    Mon Jul 06 10:22:44 2020 +0000
+++ b/sys/arch/powerpc/include/spr.h    Mon Jul 06 10:31:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spr.h,v 1.52 2018/04/19 21:50:07 christos Exp $        */
+/*     $NetBSD: spr.h,v 1.53 2020/07/06 10:31:23 rin Exp $     */
 
 /*
  * Copyright (c) 2001, The NetBSD Foundation, Inc.
@@ -30,6 +30,10 @@
 
 #if !defined(_LOCORE) && defined(_KERNEL)
 
+#ifdef _KERNEL_OPT
+#include "opt_ppcarch.h"
+#endif
+
 #include <powerpc/oea/cpufeat.h>
 
 #if defined(PPC_OEA64_BRIDGE) || defined (_ARCH_PPC64)
diff -r 60ba22d69be5 -r 94a643ede3ed sys/arch/powerpc/oea/cpu_subr.c
--- a/sys/arch/powerpc/oea/cpu_subr.c   Mon Jul 06 10:22:44 2020 +0000
+++ b/sys/arch/powerpc/oea/cpu_subr.c   Mon Jul 06 10:31:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu_subr.c,v 1.103 2020/07/06 09:34:17 rin Exp $       */
+/*     $NetBSD: cpu_subr.c,v 1.104 2020/07/06 10:31:23 rin Exp $       */
 
 /*-
  * Copyright (c) 2001 Matt Thomas.
@@ -34,13 +34,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.103 2020/07/06 09:34:17 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.104 2020/07/06 10:31:23 rin Exp $");
 
 #include "sysmon_envsys.h"
 
 #ifdef _KERNEL_OPT
 #include "opt_altivec.h"
 #include "opt_multiprocessor.h"
+#include "opt_ppcarch.h"
 #include "opt_ppccache.h"
 #include "opt_ppcparam.h"
 #endif
diff -r 60ba22d69be5 -r 94a643ede3ed sys/arch/powerpc/oea/ofw_subr.S
--- a/sys/arch/powerpc/oea/ofw_subr.S   Mon Jul 06 10:22:44 2020 +0000
+++ b/sys/arch/powerpc/oea/ofw_subr.S   Mon Jul 06 10:31:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ofw_subr.S,v 1.11 2019/11/15 23:43:12 macallan Exp $   */
+/*     $NetBSD: ofw_subr.S,v 1.12 2020/07/06 10:31:23 rin Exp $        */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -31,6 +31,9 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef _KERNEL_OPT
+#include "opt_ppcarch.h"
+#endif
 
        .local  firmstk
        .globl  openfirmware_entry
diff -r 60ba22d69be5 -r 94a643ede3ed sys/arch/powerpc/pic/intr.c
--- a/sys/arch/powerpc/pic/intr.c       Mon Jul 06 10:22:44 2020 +0000
+++ b/sys/arch/powerpc/pic/intr.c       Mon Jul 06 10:31:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.c,v 1.28 2020/07/06 09:34:18 rin Exp $ */
+/*     $NetBSD: intr.c,v 1.29 2020/07/06 10:31:23 rin Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -29,12 +29,13 @@
 #define __INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.28 2020/07/06 09:34:18 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.29 2020/07/06 10:31:23 rin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_interrupt.h"
 #include "opt_multiprocessor.h"
 #include "opt_pic.h"
+#include "opt_ppcarch.h"
 #endif
 
 #include <sys/param.h>
diff -r 60ba22d69be5 -r 94a643ede3ed sys/arch/powerpc/powerpc/bus_dma.c
--- a/sys/arch/powerpc/powerpc/bus_dma.c        Mon Jul 06 10:22:44 2020 +0000
+++ b/sys/arch/powerpc/powerpc/bus_dma.c        Mon Jul 06 10:31:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_dma.c,v 1.51 2020/07/06 09:34:18 rin Exp $ */
+/*     $NetBSD: bus_dma.c,v 1.52 2020/07/06 10:31:24 rin Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -33,7 +33,11 @@
 #define _POWERPC_BUS_DMA_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.51 2020/07/06 09:34:18 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.52 2020/07/06 10:31:24 rin Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_ppcarch.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 60ba22d69be5 -r 94a643ede3ed sys/arch/powerpc/powerpc/bus_space.c
--- a/sys/arch/powerpc/powerpc/bus_space.c      Mon Jul 06 10:22:44 2020 +0000
+++ b/sys/arch/powerpc/powerpc/bus_space.c      Mon Jul 06 10:31:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_space.c,v 1.37 2020/07/06 09:34:18 rin Exp $       */
+/*     $NetBSD: bus_space.c,v 1.38 2020/07/06 10:31:24 rin Exp $       */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -33,7 +33,11 @@
 #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 $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.38 2020/07/06 10:31:24 rin Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_ppcarch.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 60ba22d69be5 -r 94a643ede3ed sys/arch/powerpc/powerpc/clock.c
--- a/sys/arch/powerpc/powerpc/clock.c  Mon Jul 06 10:22:44 2020 +0000
+++ b/sys/arch/powerpc/powerpc/clock.c  Mon Jul 06 10:31:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.16 2014/03/18 20:11:08 macallan Exp $      */
+/*     $NetBSD: clock.c,v 1.17 2020/07/06 10:31:24 rin Exp $   */
 /*      $OpenBSD: clock.c,v 1.3 1997/10/13 13:42:53 pefo Exp $ */
 
 /*
@@ -33,7 +33,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.16 2014/03/18 20:11:08 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.17 2020/07/06 10:31:24 rin Exp $");