Module Name: src
Committed By: tsutsui
Date: Thu Feb 2 16:59:43 UTC 2012
Modified Files:
src/sys/arch/atari/include: cpu.h
src/sys/arch/cesfic/include: cpu.h
src/sys/arch/hp300/include: cpu.h
src/sys/arch/luna68k/include: cpu.h
src/sys/arch/mac68k/include: cpu.h
src/sys/arch/mvme68k/include: cpu.h
src/sys/arch/news68k/include: cpu.h
src/sys/arch/next68k/include: cpu.h
src/sys/arch/x68k/include: cpu.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/atari/include/cpu.h
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/cesfic/include/cpu.h
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/hp300/include/cpu.h
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/luna68k/include/cpu.h
cvs rdiff -u -r1.96 -r1.97 src/sys/arch/mac68k/include/cpu.h
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/mvme68k/include/cpu.h
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/news68k/include/cpu.h
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/next68k/include/cpu.h
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/x68k/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/atari/include/cpu.h
diff -u src/sys/arch/atari/include/cpu.h:1.68 src/sys/arch/atari/include/cpu.h:1.69
--- src/sys/arch/atari/include/cpu.h:1.68 Tue Nov 15 12:23:22 2011
+++ src/sys/arch/atari/include/cpu.h Thu Feb 2 16:59:42 2012
@@ -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 *);
Index: src/sys/arch/cesfic/include/cpu.h
diff -u src/sys/arch/cesfic/include/cpu.h:1.27 src/sys/arch/cesfic/include/cpu.h:1.28
--- src/sys/arch/cesfic/include/cpu.h:1.27 Mon May 16 13:22:52 2011
+++ src/sys/arch/cesfic/include/cpu.h Thu Feb 2 16:59:42 2012
@@ -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
Index: src/sys/arch/hp300/include/cpu.h
diff -u src/sys/arch/hp300/include/cpu.h:1.66 src/sys/arch/hp300/include/cpu.h:1.67
--- src/sys/arch/hp300/include/cpu.h:1.66 Mon May 16 13:22:53 2011
+++ src/sys/arch/hp300/include/cpu.h Thu Feb 2 16:59:42 2012
@@ -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)
/*
- * Get common m68k CPU definitions.
+ * Exported definitions unique to hp300/68k cpu support.
*/
-#include <m68k/cpu.h>
#include <machine/hp300spu.h>
/*
Index: src/sys/arch/luna68k/include/cpu.h
diff -u src/sys/arch/luna68k/include/cpu.h:1.30 src/sys/arch/luna68k/include/cpu.h:1.31
--- src/sys/arch/luna68k/include/cpu.h:1.30 Mon May 16 13:22:53 2011
+++ src/sys/arch/luna68k/include/cpu.h Thu Feb 2 16:59:42 2012
@@ -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
/*
Index: src/sys/arch/mac68k/include/cpu.h
diff -u src/sys/arch/mac68k/include/cpu.h:1.96 src/sys/arch/mac68k/include/cpu.h:1.97
--- src/sys/arch/mac68k/include/cpu.h:1.96 Mon May 16 13:22:54 2011
+++ src/sys/arch/mac68k/include/cpu.h Thu Feb 2 16:59:43 2012
@@ -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
/*
Index: src/sys/arch/mvme68k/include/cpu.h
diff -u src/sys/arch/mvme68k/include/cpu.h:1.46 src/sys/arch/mvme68k/include/cpu.h:1.47
--- src/sys/arch/mvme68k/include/cpu.h:1.46 Tue Feb 8 20:20:20 2011
+++ src/sys/arch/mvme68k/include/cpu.h Thu Feb 2 16:59:43 2012
@@ -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
/*
Index: src/sys/arch/news68k/include/cpu.h
diff -u src/sys/arch/news68k/include/cpu.h:1.40 src/sys/arch/news68k/include/cpu.h:1.41
--- src/sys/arch/news68k/include/cpu.h:1.40 Sun Nov 20 15:38:00 2011
+++ src/sys/arch/news68k/include/cpu.h Thu Feb 2 16:59:43 2012
@@ -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?
Index: src/sys/arch/next68k/include/cpu.h
diff -u src/sys/arch/next68k/include/cpu.h:1.45 src/sys/arch/next68k/include/cpu.h:1.46
--- src/sys/arch/next68k/include/cpu.h:1.45 Mon May 16 13:22:54 2011
+++ src/sys/arch/next68k/include/cpu.h Thu Feb 2 16:59:43 2012
@@ -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
/*
Index: src/sys/arch/x68k/include/cpu.h
diff -u src/sys/arch/x68k/include/cpu.h:1.55 src/sys/arch/x68k/include/cpu.h:1.56
--- src/sys/arch/x68k/include/cpu.h:1.55 Tue Nov 15 12:23:23 2011
+++ src/sys/arch/x68k/include/cpu.h Thu Feb 2 16:59:43 2012
@@ -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
/*
