Module Name: src
Committed By: rin
Date: Mon Jul 6 10:31:24 UTC 2020
Modified Files:
src/sys/arch/powerpc/fpu: fpu_emu.c
src/sys/arch/powerpc/ibm4xx: clock.c
src/sys/arch/powerpc/include: cpu_counter.h pio.h spr.h
src/sys/arch/powerpc/include/oea: bat.h hid.h spr.h
src/sys/arch/powerpc/oea: cpu_subr.c ofw_subr.S
src/sys/arch/powerpc/pic: intr.c
src/sys/arch/powerpc/powerpc: bus_dma.c bus_space.c clock.c db_disasm.c
fixup.c pio_subr.S pmap_subr.c
Log Message:
Include missing opt_ppcarch.h.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/powerpc/fpu/fpu_emu.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/powerpc/ibm4xx/clock.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/include/cpu_counter.h \
src/sys/arch/powerpc/include/pio.h
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/powerpc/include/spr.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/powerpc/include/oea/bat.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/include/oea/hid.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/include/oea/spr.h
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/powerpc/oea/cpu_subr.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/oea/ofw_subr.S
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/powerpc/pic/intr.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/powerpc/powerpc/bus_dma.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/powerpc/powerpc/bus_space.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/powerpc/clock.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/powerpc/powerpc/db_disasm.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/powerpc/fixup.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/powerpc/powerpc/pio_subr.S
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/powerpc/powerpc/pmap_subr.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/fpu/fpu_emu.c
diff -u src/sys/arch/powerpc/fpu/fpu_emu.c:1.23 src/sys/arch/powerpc/fpu/fpu_emu.c:1.24
--- src/sys/arch/powerpc/fpu/fpu_emu.c:1.23 Mon Jul 6 09:34:16 2020
+++ src/sys/arch/powerpc/fpu/fpu_emu.c Mon Jul 6 10:31:23 2020
@@ -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>
Index: src/sys/arch/powerpc/ibm4xx/clock.c
diff -u src/sys/arch/powerpc/ibm4xx/clock.c:1.28 src/sys/arch/powerpc/ibm4xx/clock.c:1.29
--- src/sys/arch/powerpc/ibm4xx/clock.c:1.28 Fri May 29 12:30:40 2020
+++ src/sys/arch/powerpc/ibm4xx/clock.c Mon Jul 6 10:31:23 2020
@@ -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>
Index: src/sys/arch/powerpc/include/cpu_counter.h
diff -u src/sys/arch/powerpc/include/cpu_counter.h:1.8 src/sys/arch/powerpc/include/cpu_counter.h:1.9
--- src/sys/arch/powerpc/include/cpu_counter.h:1.8 Tue Jan 18 01:02:54 2011
+++ src/sys/arch/powerpc/include/cpu_counter.h Mon Jul 6 10:31:23 2020
@@ -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>
Index: src/sys/arch/powerpc/include/pio.h
diff -u src/sys/arch/powerpc/include/pio.h:1.8 src/sys/arch/powerpc/include/pio.h:1.9
--- src/sys/arch/powerpc/include/pio.h:1.8 Thu Feb 20 05:10:01 2020
+++ src/sys/arch/powerpc/include/pio.h Mon Jul 6 10:31:23 2020
@@ -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.
*/
Index: src/sys/arch/powerpc/include/spr.h
diff -u src/sys/arch/powerpc/include/spr.h:1.52 src/sys/arch/powerpc/include/spr.h:1.53
--- src/sys/arch/powerpc/include/spr.h:1.52 Thu Apr 19 21:50:07 2018
+++ src/sys/arch/powerpc/include/spr.h Mon Jul 6 10:31:23 2020
@@ -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)
Index: src/sys/arch/powerpc/include/oea/bat.h
diff -u src/sys/arch/powerpc/include/oea/bat.h:1.19 src/sys/arch/powerpc/include/oea/bat.h:1.20
--- src/sys/arch/powerpc/include/oea/bat.h:1.19 Mon Jul 6 09:34:17 2020
+++ src/sys/arch/powerpc/include/oea/bat.h Mon Jul 6 10:31:23 2020
@@ -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 {
Index: src/sys/arch/powerpc/include/oea/hid.h
diff -u src/sys/arch/powerpc/include/oea/hid.h:1.12 src/sys/arch/powerpc/include/oea/hid.h:1.13
--- src/sys/arch/powerpc/include/oea/hid.h:1.12 Fri Feb 16 18:04:06 2018
+++ src/sys/arch/powerpc/include/oea/hid.h Mon Jul 6 10:31:23 2020
@@ -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)
Index: src/sys/arch/powerpc/include/oea/spr.h
diff -u src/sys/arch/powerpc/include/oea/spr.h:1.6 src/sys/arch/powerpc/include/oea/spr.h:1.7
--- src/sys/arch/powerpc/include/oea/spr.h:1.6 Fri Jun 1 18:18:11 2018
+++ src/sys/arch/powerpc/include/oea/spr.h Mon Jul 6 10:31:23 2020
@@ -1,17 +1,21 @@
-/* $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)
-#if defined(PPC_OEA64_BRIDGE) || defined (_ARCH_PPC64)
+#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 /* !_LOCORE && _KERNEL */
+
/*
* Special Purpose Register declarations.
*
Index: src/sys/arch/powerpc/oea/cpu_subr.c
diff -u src/sys/arch/powerpc/oea/cpu_subr.c:1.103 src/sys/arch/powerpc/oea/cpu_subr.c:1.104
--- src/sys/arch/powerpc/oea/cpu_subr.c:1.103 Mon Jul 6 09:34:17 2020
+++ src/sys/arch/powerpc/oea/cpu_subr.c Mon Jul 6 10:31:23 2020
@@ -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
Index: src/sys/arch/powerpc/oea/ofw_subr.S
diff -u src/sys/arch/powerpc/oea/ofw_subr.S:1.11 src/sys/arch/powerpc/oea/ofw_subr.S:1.12
--- src/sys/arch/powerpc/oea/ofw_subr.S:1.11 Fri Nov 15 23:43:12 2019
+++ src/sys/arch/powerpc/oea/ofw_subr.S Mon Jul 6 10:31:23 2020
@@ -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
Index: src/sys/arch/powerpc/pic/intr.c
diff -u src/sys/arch/powerpc/pic/intr.c:1.28 src/sys/arch/powerpc/pic/intr.c:1.29
--- src/sys/arch/powerpc/pic/intr.c:1.28 Mon Jul 6 09:34:18 2020
+++ src/sys/arch/powerpc/pic/intr.c Mon Jul 6 10:31:23 2020
@@ -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>
Index: src/sys/arch/powerpc/powerpc/bus_dma.c
diff -u src/sys/arch/powerpc/powerpc/bus_dma.c:1.51 src/sys/arch/powerpc/powerpc/bus_dma.c:1.52
--- src/sys/arch/powerpc/powerpc/bus_dma.c:1.51 Mon Jul 6 09:34:18 2020
+++ src/sys/arch/powerpc/powerpc/bus_dma.c Mon Jul 6 10:31:24 2020
@@ -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>
Index: src/sys/arch/powerpc/powerpc/bus_space.c
diff -u src/sys/arch/powerpc/powerpc/bus_space.c:1.37 src/sys/arch/powerpc/powerpc/bus_space.c:1.38
--- src/sys/arch/powerpc/powerpc/bus_space.c:1.37 Mon Jul 6 09:34:18 2020
+++ src/sys/arch/powerpc/powerpc/bus_space.c Mon Jul 6 10:31:24 2020
@@ -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>
Index: src/sys/arch/powerpc/powerpc/clock.c
diff -u src/sys/arch/powerpc/powerpc/clock.c:1.16 src/sys/arch/powerpc/powerpc/clock.c:1.17
--- src/sys/arch/powerpc/powerpc/clock.c:1.16 Tue Mar 18 20:11:08 2014
+++ src/sys/arch/powerpc/powerpc/clock.c Mon Jul 6 10:31:24 2020
@@ -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 $");
+
+#ifdef _KERNEL_OPT
+#include "opt_ppcarch.h"
+#endif
#include <sys/param.h>
#include <sys/kernel.h>
Index: src/sys/arch/powerpc/powerpc/db_disasm.c
diff -u src/sys/arch/powerpc/powerpc/db_disasm.c:1.28 src/sys/arch/powerpc/powerpc/db_disasm.c:1.29
--- src/sys/arch/powerpc/powerpc/db_disasm.c:1.28 Thu Jul 4 23:00:23 2013
+++ src/sys/arch/powerpc/powerpc/db_disasm.c Mon Jul 6 10:31:24 2020
@@ -1,8 +1,12 @@
-/* $NetBSD: db_disasm.c,v 1.28 2013/07/04 23:00:23 joerg Exp $ */
+/* $NetBSD: db_disasm.c,v 1.29 2020/07/06 10:31:24 rin Exp $ */
/* $OpenBSD: db_disasm.c,v 1.2 1996/12/28 06:21:48 rahnds Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.28 2013/07/04 23:00:23 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.29 2020/07/06 10:31:24 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.11 src/sys/arch/powerpc/powerpc/fixup.c:1.12
--- src/sys/arch/powerpc/powerpc/fixup.c:1.11 Mon Jul 6 09:34:18 2020
+++ src/sys/arch/powerpc/powerpc/fixup.c Mon Jul 6 10:31:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fixup.c,v 1.11 2020/07/06 09:34:18 rin Exp $ */
+/* $NetBSD: fixup.c,v 1.12 2020/07/06 10:31:24 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,7 +35,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fixup.c,v 1.11 2020/07/06 09:34:18 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fixup.c,v 1.12 2020/07/06 10:31:24 rin Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_ppcarch.h"
+#endif
#include <sys/param.h>
#include <sys/types.h>
Index: src/sys/arch/powerpc/powerpc/pio_subr.S
diff -u src/sys/arch/powerpc/powerpc/pio_subr.S:1.17 src/sys/arch/powerpc/powerpc/pio_subr.S:1.18
--- src/sys/arch/powerpc/powerpc/pio_subr.S:1.17 Thu Feb 20 05:10:02 2020
+++ src/sys/arch/powerpc/powerpc/pio_subr.S Mon Jul 6 10:31:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pio_subr.S,v 1.17 2020/02/20 05:10:02 rin Exp $ */
+/* $NetBSD: pio_subr.S,v 1.18 2020/07/06 10:31:24 rin Exp $ */
/*
* Copyright (c) 2003 Matt Thomas
@@ -27,6 +27,11 @@
* SUCH DAMAGE.
*
*/
+
+#ifdef _KERNEL_OPT
+#include "opt_ppcarch.h"
+#endif
+
/*
* Assembly note:
* We use rotlw instead of slw because rotlw ignores bit 26 and slw
Index: src/sys/arch/powerpc/powerpc/pmap_subr.c
diff -u src/sys/arch/powerpc/powerpc/pmap_subr.c:1.29 src/sys/arch/powerpc/powerpc/pmap_subr.c:1.30
--- src/sys/arch/powerpc/powerpc/pmap_subr.c:1.29 Mon Jul 6 09:34:18 2020
+++ src/sys/arch/powerpc/powerpc/pmap_subr.c Mon Jul 6 10:31:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_subr.c,v 1.29 2020/07/06 09:34:18 rin Exp $ */
+/* $NetBSD: pmap_subr.c,v 1.30 2020/07/06 10:31:24 rin Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,12 +29,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_subr.c,v 1.29 2020/07/06 09:34:18 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_subr.c,v 1.30 2020/07/06 10:31:24 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_altivec.h"
#include "opt_multiprocessor.h"
#include "opt_pmap.h"
+#include "opt_ppcarch.h"
#endif
#include <sys/param.h>
