Module Name: src
Committed By: matt
Date: Mon Jun 20 06:35:41 UTC 2011
Modified Files:
src/sys/arch/amigappc/include: cpu.h
src/sys/arch/bebox/include: cpu.h
src/sys/arch/evbppc/include: cpu.h
src/sys/arch/ibmnws/include: cpu.h
src/sys/arch/macppc/include: cpu.h
src/sys/arch/mvmeppc/include: cpu.h
src/sys/arch/ofppc/include: cpu.h
src/sys/arch/prep/include: cpu.h
src/sys/arch/rs6000/include: cpu.h
src/sys/arch/sandpoint/include: cpu.h
Log Message:
Don't expose port-specific if _MODULE is defined.
Don't _MACHINE_CPU_H_, _<PORT>_CPU_H_
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/amigappc/include/cpu.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/bebox/include/cpu.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/include/cpu.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ibmnws/include/cpu.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/macppc/include/cpu.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mvmeppc/include/cpu.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/ofppc/include/cpu.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/prep/include/cpu.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/rs6000/include/cpu.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sandpoint/include/cpu.h
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/amigappc/include/cpu.h
diff -u src/sys/arch/amigappc/include/cpu.h:1.19 src/sys/arch/amigappc/include/cpu.h:1.20
--- src/sys/arch/amigappc/include/cpu.h:1.19 Thu Jan 20 15:44:56 2011
+++ src/sys/arch/amigappc/include/cpu.h Mon Jun 20 06:35:39 2011
@@ -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_ */
Index: src/sys/arch/bebox/include/cpu.h
diff -u src/sys/arch/bebox/include/cpu.h:1.12 src/sys/arch/bebox/include/cpu.h:1.13
--- src/sys/arch/bebox/include/cpu.h:1.12 Wed Oct 17 19:53:59 2007
+++ src/sys/arch/bebox/include/cpu.h Mon Jun 20 06:35:39 2011
@@ -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_ */
Index: src/sys/arch/evbppc/include/cpu.h
diff -u src/sys/arch/evbppc/include/cpu.h:1.6 src/sys/arch/evbppc/include/cpu.h:1.7
--- src/sys/arch/evbppc/include/cpu.h:1.6 Sat Jun 18 06:44:26 2011
+++ src/sys/arch/evbppc/include/cpu.h Mon Jun 20 06:35:40 2011
@@ -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_ */
Index: src/sys/arch/ibmnws/include/cpu.h
diff -u src/sys/arch/ibmnws/include/cpu.h:1.2 src/sys/arch/ibmnws/include/cpu.h:1.3
--- src/sys/arch/ibmnws/include/cpu.h:1.2 Sun Dec 11 12:17:50 2005
+++ src/sys/arch/ibmnws/include/cpu.h Mon Jun 20 06:35:40 2011
@@ -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_ */
Index: src/sys/arch/macppc/include/cpu.h
diff -u src/sys/arch/macppc/include/cpu.h:1.18 src/sys/arch/macppc/include/cpu.h:1.19
--- src/sys/arch/macppc/include/cpu.h:1.18 Sun Aug 26 02:47:37 2001
+++ src/sys/arch/macppc/include/cpu.h Mon Jun 20 06:35:40 2011
@@ -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_ */
Index: src/sys/arch/mvmeppc/include/cpu.h
diff -u src/sys/arch/mvmeppc/include/cpu.h:1.1 src/sys/arch/mvmeppc/include/cpu.h:1.2
--- src/sys/arch/mvmeppc/include/cpu.h:1.1 Wed Feb 27 21:02:14 2002
+++ src/sys/arch/mvmeppc/include/cpu.h Mon Jun 20 06:35:40 2011
@@ -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 */
+
+#include <powerpc/cpu.h>
-#endif /* _MACHINE_CPU_H_ */
+#endif /* _MVMEPPC_CPU_H_ */
Index: src/sys/arch/ofppc/include/cpu.h
diff -u src/sys/arch/ofppc/include/cpu.h:1.23 src/sys/arch/ofppc/include/cpu.h:1.24
--- src/sys/arch/ofppc/include/cpu.h:1.23 Tue Apr 8 02:33:03 2008
+++ src/sys/arch/ofppc/include/cpu.h Mon Jun 20 06:35:40 2011
@@ -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_ */
Index: src/sys/arch/prep/include/cpu.h
diff -u src/sys/arch/prep/include/cpu.h:1.9 src/sys/arch/prep/include/cpu.h:1.10
--- src/sys/arch/prep/include/cpu.h:1.9 Wed Oct 17 19:56:49 2007
+++ src/sys/arch/prep/include/cpu.h Mon Jun 20 06:35:40 2011
@@ -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_ */
Index: src/sys/arch/rs6000/include/cpu.h
diff -u src/sys/arch/rs6000/include/cpu.h:1.1 src/sys/arch/rs6000/include/cpu.h:1.2
--- src/sys/arch/rs6000/include/cpu.h:1.1 Mon Dec 17 19:09:10 2007
+++ src/sys/arch/rs6000/include/cpu.h Mon Jun 20 06:35:41 2011
@@ -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_ */
Index: src/sys/arch/sandpoint/include/cpu.h
diff -u src/sys/arch/sandpoint/include/cpu.h:1.3 src/sys/arch/sandpoint/include/cpu.h:1.4
--- src/sys/arch/sandpoint/include/cpu.h:1.3 Sun Aug 26 02:47:38 2001
+++ src/sys/arch/sandpoint/include/cpu.h Mon Jun 20 06:35:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.3 2001/08/26 02:47:38 matt Exp $ */
+/* $NetBSD: cpu.h,v 1.4 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 _SANDPOINT_CPU_H_
+#define _SANDPOINT_CPU_H_
-#ifdef _KERNEL
+#if defined(_KERNEL) && !defined(_MODULE)
#define CPU_MAXNUM 1
extern char *bootpath;
#endif
#include <powerpc/cpu.h>
-#endif /* _MACHINE_CPU_H_ */
+#endif /* _SANDPOINT_CPU_H_ */
