[src/trunk]: src/sys/arch Don't expose port-specific if _MODULE is defined.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch Don't expose port-specific if _MODULE is defined.
From: matt <matt%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 20:38:19 +0000
details:   https://anonhg.NetBSD.org/src/rev/30f9f607086e
branches:  trunk
changeset: 766281:30f9f607086e
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Jun 20 06:35:39 2011 +0000

description:
Don't expose port-specific if _MODULE is defined.
Don't _MACHINE_CPU_H_, _<PORT>_CPU_H_

diffstat:

 sys/arch/amigappc/include/cpu.h  |  16 ++++++++--------
 sys/arch/bebox/include/cpu.h     |  10 +++++-----
 sys/arch/evbppc/include/cpu.h    |  14 ++++++++------
 sys/arch/ibmnws/include/cpu.h    |  10 +++++-----
 sys/arch/macppc/include/cpu.h    |  10 +++++-----
 sys/arch/mvmeppc/include/cpu.h   |  18 +++++++++---------
 sys/arch/ofppc/include/cpu.h     |  10 +++++-----
 sys/arch/prep/include/cpu.h      |  10 +++++-----
 sys/arch/rs6000/include/cpu.h    |  10 +++++-----
 sys/arch/sandpoint/include/cpu.h |  10 +++++-----
 10 files changed, 60 insertions(+), 58 deletions(-)

diffs (truncated from 324 to 300 lines):

diff -r f91424656fdd -r 30f9f607086e sys/arch/amigappc/include/cpu.h
--- a/sys/arch/amigappc/include/cpu.h   Mon Jun 20 06:29:53 2011 +0000
+++ b/sys/arch/amigappc/include/cpu.h   Mon Jun 20 06:35:39 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.19 2011/01/20 15:44:56 phx Exp $     */
+/*     $NetBSD: cpu.h,v 1.20 2011/06/20 06:35:39 matt Exp $    */
 
 /*
  * Copyright (C) 1995-1997 Wolfgang Solfrank.
@@ -30,12 +30,12 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef        _MACHINE_CPU_H_
-#define        _MACHINE_CPU_H_
+#ifndef        _AMIGAPPC_CPU_H_
+#define        _AMIGAPPC_CPU_H_
+#define        _MACHINE_CPU_H_         /* for <m68k/cpu.h> */
 
-#if defined(_KERNEL)
+#if defined(_KERNEL) && !defined(_MODULE)
 #define        CPU_MAXNUM      1
-
 /*
  * Amiga models
  */
@@ -67,8 +67,6 @@
  */
 int badaddr_read(void *, size_t, int *);
 
-#endif /* _KERNEL */
-
 /*
  * Reorder protection when accessing device registers.
  */
@@ -79,6 +77,8 @@
  */
 #define amiga_cpu_sync() __asm volatile ("sync; isync")
 
+#endif /* _KERNEL && !_MODULE */
+
 #include <powerpc/cpu.h>
 
-#endif /* _MACHINE_CPU_H_ */
+#endif /* _AMIGAPPC_CPU_H_ */
diff -r f91424656fdd -r 30f9f607086e sys/arch/bebox/include/cpu.h
--- a/sys/arch/bebox/include/cpu.h      Mon Jun 20 06:29:53 2011 +0000
+++ b/sys/arch/bebox/include/cpu.h      Mon Jun 20 06:35:39 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.12 2007/10/17 19:53:59 garbled Exp $ */
+/*     $NetBSD: cpu.h,v 1.13 2011/06/20 06:35:39 matt Exp $    */
 
 /*
  * Copyright (C) 1995-1997 Wolfgang Solfrank.
@@ -30,14 +30,14 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef        _MACHINE_CPU_H_
-#define        _MACHINE_CPU_H_
+#ifndef        _BEBOX_CPU_H_
+#define        _BEBOX_CPU_H_
 
-#if defined(_KERNEL)
+#if defined(_KERNEL) && !defined(_MODULE)
 #define        CPU_MAXNUM      2
 extern char bootpath[];
 #endif
 
 #include <powerpc/cpu.h>
 
-#endif /* _MACHINE_CPU_H_ */
+#endif /* _BEBOX_CPU_H_ */
diff -r f91424656fdd -r 30f9f607086e sys/arch/evbppc/include/cpu.h
--- a/sys/arch/evbppc/include/cpu.h     Mon Jun 20 06:29:53 2011 +0000
+++ b/sys/arch/evbppc/include/cpu.h     Mon Jun 20 06:35:39 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.6 2011/06/18 06:44:26 matt Exp $     */
+/*     $NetBSD: cpu.h,v 1.7 2011/06/20 06:35:40 matt Exp $     */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -35,15 +35,15 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef        _MACHINE_CPU_H_
-#define        _MACHINE_CPU_H_
+#ifndef        _EVBPPC_CPU_H_
+#define        _EVBPPC_CPU_H_
 
+#if defined(_KERNEL) && !defined(_MODULE)
 #ifdef _KERNEL_OPT
 #include "opt_ppcarch.h"
 #include "opt_multiprocessor.h"
 #endif
 
-#ifdef _KERNEL
 #ifdef PPC_IBM4XX
 extern int fake_mapiodev;
 #endif
@@ -54,11 +54,13 @@
 #define CPU_MAXNUM 1
 #endif
 
+#endif /* _KERNEL && !_MODULE */
+
 #include <powerpc/cpu.h>
 
+#if defined(_KERNEL)
 extern char module_machine_booke[];
 extern char module_machine_ibm4xx[];
-
 #endif /* _KERNEL */
 
-#endif /* _MACHINE_CPU_H_ */
+#endif /* _EVBPPC_CPU_H_ */
diff -r f91424656fdd -r 30f9f607086e sys/arch/ibmnws/include/cpu.h
--- a/sys/arch/ibmnws/include/cpu.h     Mon Jun 20 06:29:53 2011 +0000
+++ b/sys/arch/ibmnws/include/cpu.h     Mon Jun 20 06:35:39 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.2 2005/12/11 12:17:50 christos Exp $ */
+/*     $NetBSD: cpu.h,v 1.3 2011/06/20 06:35:40 matt Exp $     */
 
 /*
  * Copyright (C) 1995-1997 Wolfgang Solfrank.
@@ -30,14 +30,14 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef        _MACHINE_CPU_H_
-#define        _MACHINE_CPU_H_
+#ifndef        _IBMNWS_CPU_H_
+#define        _IBMNWS_CPU_H_
 
-#if defined(_KERNEL)
+#if defined(_KERNEL) && !defined(_MODULE)
 #define        CPU_MAXNUM      1
 extern char *bootpath;
 #endif
 
 #include <powerpc/cpu.h>
 
-#endif /* _MACHINE_CPU_H_ */
+#endif /* _IBMNWS_CPU_H_ */
diff -r f91424656fdd -r 30f9f607086e sys/arch/macppc/include/cpu.h
--- a/sys/arch/macppc/include/cpu.h     Mon Jun 20 06:29:53 2011 +0000
+++ b/sys/arch/macppc/include/cpu.h     Mon Jun 20 06:35:39 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.18 2001/08/26 02:47:37 matt Exp $    */
+/*     $NetBSD: cpu.h,v 1.19 2011/06/20 06:35:40 matt Exp $    */
 
 /*
  * Copyright (C) 1995-1997 Wolfgang Solfrank.
@@ -30,14 +30,14 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef        _MACHINE_CPU_H_
-#define        _MACHINE_CPU_H_
+#ifndef        _MACPPC_CPU_H_
+#define        _MACPPC_CPU_H_
 
-#if defined(_KERNEL)
+#if defined(_KERNEL) && !defined(_MODULE)
 #define        CPU_MAXNUM      2
 extern char bootpath[];
 #endif /* _KERNEL */
 
 #include <powerpc/cpu.h>
 
-#endif /* _MACHINE_CPU_H_ */
+#endif /* _MACPPC_CPU_H_ */
diff -r f91424656fdd -r 30f9f607086e sys/arch/mvmeppc/include/cpu.h
--- a/sys/arch/mvmeppc/include/cpu.h    Mon Jun 20 06:29:53 2011 +0000
+++ b/sys/arch/mvmeppc/include/cpu.h    Mon Jun 20 06:35:39 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.1 2002/02/27 21:02:14 scw Exp $      */
+/*     $NetBSD: cpu.h,v 1.2 2011/06/20 06:35:40 matt Exp $     */
 
 /*
  * Copyright (C) 1995-1997 Wolfgang Solfrank.
@@ -30,15 +30,12 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef        _MACHINE_CPU_H_
-#define        _MACHINE_CPU_H_
+#ifndef        _MVMEPPC_CPU_H_
+#define        _MVMEPPC_CPU_H_
 
-#ifdef _KERNEL
-#define        CPU_MAXNUM      1
+#if defined(_KERNEL) && !defined(_MODULE)
+#define        CPU_MAXNUM              1
 extern char *bootpath;
-#endif
-
-#include <powerpc/cpu.h>
 
 #define        MVMEPPC_FAMILY(m)       ((m) & 0xfff0)
 
@@ -47,5 +44,8 @@
 #define        MVMEPPC_FAMILY_230x     0x2300
 #define        MVMEPPC_FAMILY_240x     0x2400
 #define        MVMEPPC_FAMILY_360x     0x3600
+#endif /* _KERNEL && !_MODULE */
 
-#endif /* _MACHINE_CPU_H_ */
+#include <powerpc/cpu.h>
+
+#endif /* _MVMEPPC_CPU_H_ */
diff -r f91424656fdd -r 30f9f607086e sys/arch/ofppc/include/cpu.h
--- a/sys/arch/ofppc/include/cpu.h      Mon Jun 20 06:29:53 2011 +0000
+++ b/sys/arch/ofppc/include/cpu.h      Mon Jun 20 06:35:39 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.23 2008/04/08 02:33:03 garbled Exp $ */
+/*     $NetBSD: cpu.h,v 1.24 2011/06/20 06:35:40 matt Exp $    */
 
 /*
  * Copyright (C) 1995-1997 Wolfgang Solfrank.
@@ -30,14 +30,14 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef        _MACHINE_CPU_H_
-#define        _MACHINE_CPU_H_
+#ifndef        _OFPPC_CPU_H_
+#define        _OFPPC_CPU_H_
 
-#if defined(_KERNEL)
+#if defined(_KERNEL) && !defined(_MODULE)
 #define        CPU_MAXNUM      16
 extern char bootpath[];
 #endif /* _KERNEL */
 
 #include <powerpc/cpu.h>
 
-#endif /* _MACHINE_CPU_H_ */
+#endif /* _OFPPC_CPU_H_ */
diff -r f91424656fdd -r 30f9f607086e sys/arch/prep/include/cpu.h
--- a/sys/arch/prep/include/cpu.h       Mon Jun 20 06:29:53 2011 +0000
+++ b/sys/arch/prep/include/cpu.h       Mon Jun 20 06:35:39 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.9 2007/10/17 19:56:49 garbled Exp $  */
+/*     $NetBSD: cpu.h,v 1.10 2011/06/20 06:35:40 matt Exp $    */
 
 /*
  * Copyright (C) 1995-1997 Wolfgang Solfrank.
@@ -30,14 +30,14 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef        _MACHINE_CPU_H_
-#define        _MACHINE_CPU_H_
+#ifndef        _PREP_CPU_H_
+#define        _PREP_CPU_H_
 
-#if defined(_KERNEL)
+#if defined(_KERNEL) && !defined(_MODULE)
 #define        CPU_MAXNUM      2
 extern char bootpath[];
 #endif
 
 #include <powerpc/cpu.h>
 
-#endif /* _MACHINE_CPU_H_ */
+#endif /* _PREP_CPU_H_ */
diff -r f91424656fdd -r 30f9f607086e sys/arch/rs6000/include/cpu.h
--- a/sys/arch/rs6000/include/cpu.h     Mon Jun 20 06:29:53 2011 +0000
+++ b/sys/arch/rs6000/include/cpu.h     Mon Jun 20 06:35:39 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.1 2007/12/17 19:09:10 garbled Exp $  */
+/*     $NetBSD: cpu.h,v 1.2 2011/06/20 06:35:41 matt Exp $     */
 
 /*
  * Copyright (C) 1995-1997 Wolfgang Solfrank.
@@ -30,14 +30,14 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef        _MACHINE_CPU_H_
-#define        _MACHINE_CPU_H_
+#ifndef        _RS6000_CPU_H_
+#define        _RS6000_CPU_H_
 
-#if defined(_KERNEL)
+#if defined(_KERNEL) && !defined(_MODULE)
 #define        CPU_MAXNUM      1
 extern char bootpath[];
 #endif
 
 #include <powerpc/cpu.h>
 
-#endif /* _MACHINE_CPU_H_ */
+#endif /* _RS6000_CPU_H_ */
diff -r f91424656fdd -r 30f9f607086e sys/arch/sandpoint/include/cpu.h
--- a/sys/arch/sandpoint/include/cpu.h  Mon Jun 20 06:29:53 2011 +0000
+++ b/sys/arch/sandpoint/include/cpu.h  Mon Jun 20 06:35:39 2011 +0000
@@ -1,4 +1,4 @@
Prev by Date: [src/trunk]: src/sys/arch/powerpc/pic Cleanup includes. Explicitly include <...
Next by Date: [src/trunk]: src/sys/arch Cleanup powerpc param.h. If compiling a MODULE, ig...
Previous by Thread: [src/trunk]: src/sys/arch/powerpc/pic Cleanup includes. Explicitly include <...
Next by Thread: [src/trunk]: src/sys/arch Cleanup powerpc param.h. If compiling a MODULE, ig...
Indexes:
Home | Main Index | Thread Index | Old Index