[src/trunk]: src/sys/arch Always include <m68k/cpu.h> (i.e. outside #if defin...

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

details:   https://anonhg.NetBSD.org/src/rev/d593ade83a7e
branches:  trunk
changeset: 773454:d593ade83a7e
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Thu Feb 02 16:59:42 2012 +0000

description:
Always include <m68k/cpu.h> (i.e. outside #if defined(_KERNEL))
for crash(8) as amiga and sun3.  There are _KERNEL protections in it.

Briefly tested by "build.sh -m news68k -U build".
Further possible botch will be fixed later.

diffstat:

 sys/arch/atari/include/cpu.h   |  13 ++++++-------
 sys/arch/cesfic/include/cpu.h  |   6 +++---
 sys/arch/hp300/include/cpu.h   |  13 ++++++-------
 sys/arch/luna68k/include/cpu.h |   7 ++++---
 sys/arch/mac68k/include/cpu.h  |  13 ++++++-------
 sys/arch/mvme68k/include/cpu.h |  13 ++++++-------
 sys/arch/news68k/include/cpu.h |  13 ++++++-------
 sys/arch/next68k/include/cpu.h |  12 +++++-------
 sys/arch/x68k/include/cpu.h    |  13 ++++++-------
 9 files changed, 48 insertions(+), 55 deletions(-)

diffs (296 lines):

diff -r d33ee347b63a -r d593ade83a7e sys/arch/atari/include/cpu.h
--- a/sys/arch/atari/include/cpu.h      Thu Feb 02 16:06:48 2012 +0000
+++ b/sys/arch/atari/include/cpu.h      Thu Feb 02 16:59:42 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.68 2011/11/15 12:23:22 tsutsui Exp $ */
+/*     $NetBSD: cpu.h,v 1.69 2012/02/02 16:59:42 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -41,12 +41,6 @@
 #ifndef _MACHINE_CPU_H_
 #define _MACHINE_CPU_H_
 
-#if defined(_KERNEL)
-
-/*
- * Exported definitions unique to atari/68k cpu support.
- */
-
 #if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif
@@ -55,6 +49,11 @@
  * Get common m68k CPU definitions.
  */
 #include <m68k/cpu.h>
+
+#if defined(_KERNEL)
+/*
+ * Exported definitions unique to atari/68k cpu support.
+ */
 #define        M68K_MMU_MOTOROLA
 
 void   cpu_proc_fork(struct proc *, struct proc *);
diff -r d33ee347b63a -r d593ade83a7e sys/arch/cesfic/include/cpu.h
--- a/sys/arch/cesfic/include/cpu.h     Thu Feb 02 16:06:48 2012 +0000
+++ b/sys/arch/cesfic/include/cpu.h     Thu Feb 02 16:59:42 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.27 2011/05/16 13:22:52 tsutsui Exp $ */
+/*     $NetBSD: cpu.h,v 1.28 2012/02/02 16:59:42 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -41,8 +41,6 @@
 #ifndef _MACHINE_CPU_H_
 #define        _MACHINE_CPU_H_
 
-#if defined(_KERNEL)
-
 #if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #include "opt_m68k_arch.h"
@@ -53,6 +51,8 @@
  */
 #include <m68k/cpu.h>
 
+#if defined(_KERNEL)
+
 /*
  * Arguments to hardclock and gatherstats encapsulate the previous
  * machine state in an opaque clockframe.  One the hp300, we use
diff -r d33ee347b63a -r d593ade83a7e sys/arch/hp300/include/cpu.h
--- a/sys/arch/hp300/include/cpu.h      Thu Feb 02 16:06:48 2012 +0000
+++ b/sys/arch/hp300/include/cpu.h      Thu Feb 02 16:59:42 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.66 2011/05/16 13:22:53 tsutsui Exp $ */
+/*     $NetBSD: cpu.h,v 1.67 2012/02/02 16:59:42 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -41,20 +41,19 @@
 #ifndef _HP300_CPU_H_
 #define        _HP300_CPU_H_
 
-#if defined(_KERNEL)
-
 #if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif
 
 /*
- * Exported definitions unique to hp300/68k cpu support.
- */
-
-/*
  * Get common m68k CPU definitions.
  */
 #include <m68k/cpu.h>
+
+#if defined(_KERNEL)
+/*
+ * Exported definitions unique to hp300/68k cpu support.
+ */
 #include <machine/hp300spu.h>
 
 /*
diff -r d33ee347b63a -r d593ade83a7e sys/arch/luna68k/include/cpu.h
--- a/sys/arch/luna68k/include/cpu.h    Thu Feb 02 16:06:48 2012 +0000
+++ b/sys/arch/luna68k/include/cpu.h    Thu Feb 02 16:59:42 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.30 2011/05/16 13:22:53 tsutsui Exp $ */
+/* $NetBSD: cpu.h,v 1.31 2012/02/02 16:59:42 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -41,8 +41,6 @@
 #ifndef _MACHINE_CPU_H
 #define _MACHINE_CPU_H
 
-#if defined(_KERNEL)
-
 #if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif
@@ -51,6 +49,9 @@
  * Get common m68k CPU definitions.
  */
 #include <m68k/cpu.h>
+
+#if defined(_KERNEL)
+
 #define M68K_MMU_MOTOROLA
 
 /*
diff -r d33ee347b63a -r d593ade83a7e sys/arch/mac68k/include/cpu.h
--- a/sys/arch/mac68k/include/cpu.h     Thu Feb 02 16:06:48 2012 +0000
+++ b/sys/arch/mac68k/include/cpu.h     Thu Feb 02 16:59:42 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.96 2011/05/16 13:22:54 tsutsui Exp $ */
+/*     $NetBSD: cpu.h,v 1.97 2012/02/02 16:59:43 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -60,12 +60,6 @@
 #ifndef _CPU_MACHINE_
 #define _CPU_MACHINE_
 
-#if defined(_KERNEL)
-
-/*
- * Exported definitions unique to mac68k/68k cpu support.
- */
-
 #if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif
@@ -74,6 +68,11 @@
  * Get common m68k definitions.
  */
 #include <m68k/cpu.h>
+
+#if defined(_KERNEL)
+/*
+ * Exported definitions unique to mac68k/68k cpu support.
+ */
 #define        M68K_MMU_MOTOROLA
 
 /*
diff -r d33ee347b63a -r d593ade83a7e sys/arch/mvme68k/include/cpu.h
--- a/sys/arch/mvme68k/include/cpu.h    Thu Feb 02 16:06:48 2012 +0000
+++ b/sys/arch/mvme68k/include/cpu.h    Thu Feb 02 16:59:42 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.46 2011/02/08 20:20:20 rmind Exp $   */
+/*     $NetBSD: cpu.h,v 1.47 2012/02/02 16:59:43 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -41,12 +41,6 @@
 #ifndef _MACHINE_CPU_H_
 #define _MACHINE_CPU_H_
 
-#if defined(_KERNEL)
-
-/*
- * Exported definitions unique to mvme68k/68k cpu support.
- */
-
 #if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #include "opt_m68k_arch.h"
@@ -56,6 +50,11 @@
  * Get common m68k CPU definitions.
  */
 #include <m68k/cpu.h>
+
+#if defined(_KERNEL)
+/*
+ * Exported definitions unique to mvme68k/68k cpu support.
+ */
 #define        M68K_MMU_MOTOROLA
 
 /*
diff -r d33ee347b63a -r d593ade83a7e sys/arch/news68k/include/cpu.h
--- a/sys/arch/news68k/include/cpu.h    Thu Feb 02 16:06:48 2012 +0000
+++ b/sys/arch/news68k/include/cpu.h    Thu Feb 02 16:59:42 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.40 2011/11/20 15:38:00 tsutsui Exp $ */
+/*     $NetBSD: cpu.h,v 1.41 2012/02/02 16:59:43 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -41,12 +41,6 @@
 #ifndef _NEWS68K_CPU_H_
 #define _NEWS68K_CPU_H_
 
-#if defined(_KERNEL)
-
-/*
- * Exported definitions unique to news68k cpu support.
- */
-
 #if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #include "opt_m68k_arch.h"
@@ -57,6 +51,11 @@
  */
 #include <m68k/cpu.h>
 
+#if defined(_KERNEL)
+/*
+ * Exported definitions unique to news68k cpu support.
+ */
+
 /*
  * XXX news1700 L2 cache would be corrupted with DC_BE and IC_BE...
  * XXX Should these be defined in machine/cpu.h?
diff -r d33ee347b63a -r d593ade83a7e sys/arch/next68k/include/cpu.h
--- a/sys/arch/next68k/include/cpu.h    Thu Feb 02 16:06:48 2012 +0000
+++ b/sys/arch/next68k/include/cpu.h    Thu Feb 02 16:59:42 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.45 2011/05/16 13:22:54 tsutsui Exp $ */
+/*     $NetBSD: cpu.h,v 1.46 2012/02/02 16:59:43 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -41,22 +41,20 @@
 #ifndef _MACHINE_CPU_H_
 #define _MACHINE_CPU_H_
 
-#if defined(_KERNEL)
-
 #if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #include "opt_m68k_arch.h"
 #endif
 
 /*
- * Exported definitions unique to next68k/68k cpu support.
- */
-
-/*
  * Get common m68k definitions.
  */
 #include <m68k/cpu.h>
 
+#if defined(_KERNEL)
+/*
+ * Exported definitions unique to next68k/68k cpu support.
+ */
 #define        M68K_MMU_MOTOROLA
 
 /*
diff -r d33ee347b63a -r d593ade83a7e sys/arch/x68k/include/cpu.h
--- a/sys/arch/x68k/include/cpu.h       Thu Feb 02 16:06:48 2012 +0000
+++ b/sys/arch/x68k/include/cpu.h       Thu Feb 02 16:59:42 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.55 2011/11/15 12:23:23 tsutsui Exp $ */
+/*     $NetBSD: cpu.h,v 1.56 2012/02/02 16:59:43 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -41,12 +41,6 @@
 #ifndef _X68K_CPU_H_
 #define        _X68K_CPU_H_
 
-#if defined(_KERNEL)
-
-/*
- * Exported definitions unique to x68k/68k cpu support.
- */
-
 #if defined(_KERNEL_OPT)
 #include "opt_m68k_arch.h"
 #include "opt_lockdebug.h"
@@ -56,6 +50,11 @@
  * Get common m68k CPU definitions.
  */
 #include <m68k/cpu.h>
+
+#if defined(_KERNEL)
+/*
+ * Exported definitions unique to x68k/68k cpu support.
+ */
 #define        M68K_MMU_MOTOROLA
 
 /*