Module Name: src
Committed By: mrg
Date: Sun Jun 6 04:50:08 UTC 2010
Modified Files:
src/sys/arch/amiga/amiga: amiga_init.c locore.s machdep.c trap.c
src/sys/arch/amiga/dev: bzivsc.c bzsc.c bztzsc.c cbiisc.c cbsc.c flsc.c
if_bah_zbus.c sbic.c
src/sys/arch/atari/atari: atari_init.c bus.c locore.s trap.c
src/sys/arch/cesfic/cesfic: locore.s trap.c
src/sys/arch/cesfic/include: cpu.h
src/sys/arch/hp300/dev: dma.c
src/sys/arch/hp300/hp300: locore.s trap.c
src/sys/arch/hp300/include: hp300spu.h
src/sys/arch/luna68k/luna68k: locore.s machdep.c pmap_bootstrap.c
trap.c
src/sys/arch/m68k/fpe: fpu_calcea.c
src/sys/arch/m68k/include: cacheops.h pmap_motorola.h
src/sys/arch/m68k/m68k: bus_dma.c cacheops.c copypage.s pmap_motorola.c
sig_machdep.c switch_subr.s sys_machdep.c
src/sys/arch/mac68k/mac68k: locore.s pmap_bootstrap.c trap.c
src/sys/arch/mvme68k/include: cpu.h
src/sys/arch/mvme68k/mvme68k: locore.s machdep.c pmap_bootstrap.c
trap.c
src/sys/arch/news68k/include: cpu.h
src/sys/arch/news68k/news68k: locore.s pmap_bootstrap.c trap.c
src/sys/arch/next68k/include: cpu.h
src/sys/arch/next68k/next68k: locore.s pmap_bootstrap.c trap.c
src/sys/arch/x68k/dev: intio_dmac.c
src/sys/arch/x68k/x68k: bus.c locore.s machdep.c pmap_bootstrap.c
trap.c
Log Message:
fix PR 6724 - convert m68k options to defflag's. this means that
M680[12346] are now available from opt_m68k_arch.h. FPSP meantioned
in the PR has already been fixed, and i could not find any more.
i built these kernels to ensure i did not break their builds:
amiga: GENERIC DRACO
atari: HADES FALCON MILAN-PCIIDE
mac68k: GENERIC
sun2: GENERIC
sun3: GENERIC GENERIC3X
cesfic: attempted GENERIC, does not build due to lack of machine/bus.h
hp300: GENERIC
luna68k: GENERIC
mvme68k: GENERIC
news68k: GENERIC
next68k: GENERIC
x68k: GENERIC
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/amiga/amiga/amiga_init.c
cvs rdiff -u -r1.149 -r1.150 src/sys/arch/amiga/amiga/locore.s
cvs rdiff -u -r1.225 -r1.226 src/sys/arch/amiga/amiga/machdep.c
cvs rdiff -u -r1.128 -r1.129 src/sys/arch/amiga/amiga/trap.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/amiga/dev/bzivsc.c
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/amiga/dev/bzsc.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/amiga/dev/bztzsc.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amiga/dev/cbiisc.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/amiga/dev/cbsc.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/amiga/dev/flsc.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/amiga/dev/if_bah_zbus.c
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/amiga/dev/sbic.c
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/atari/atari/atari_init.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/atari/atari/bus.c
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/atari/atari/locore.s
cvs rdiff -u -r1.106 -r1.107 src/sys/arch/atari/atari/trap.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/cesfic/cesfic/locore.s
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/cesfic/cesfic/trap.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/cesfic/include/cpu.h
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/hp300/dev/dma.c
cvs rdiff -u -r1.153 -r1.154 src/sys/arch/hp300/hp300/locore.s
cvs rdiff -u -r1.142 -r1.143 src/sys/arch/hp300/hp300/trap.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp300/include/hp300spu.h
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/luna68k/luna68k/locore.s
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/luna68k/luna68k/machdep.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/luna68k/luna68k/pmap_bootstrap.c
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/luna68k/luna68k/trap.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/m68k/fpe/fpu_calcea.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/m68k/include/cacheops.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/m68k/include/pmap_motorola.h
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/m68k/m68k/bus_dma.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/m68k/m68k/cacheops.c \
src/sys/arch/m68k/m68k/sys_machdep.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/m68k/m68k/copypage.s
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/m68k/m68k/pmap_motorola.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/m68k/m68k/sig_machdep.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/m68k/m68k/switch_subr.s
cvs rdiff -u -r1.160 -r1.161 src/sys/arch/mac68k/mac68k/locore.s
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/mac68k/mac68k/pmap_bootstrap.c
cvs rdiff -u -r1.140 -r1.141 src/sys/arch/mac68k/mac68k/trap.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/mvme68k/include/cpu.h
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/mvme68k/mvme68k/locore.s
cvs rdiff -u -r1.142 -r1.143 src/sys/arch/mvme68k/mvme68k/machdep.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/mvme68k/mvme68k/trap.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/news68k/include/cpu.h
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/news68k/news68k/locore.s
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/news68k/news68k/pmap_bootstrap.c
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/news68k/news68k/trap.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/next68k/include/cpu.h
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/next68k/next68k/locore.s
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/next68k/next68k/pmap_bootstrap.c
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/next68k/next68k/trap.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/x68k/dev/intio_dmac.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/x68k/x68k/bus.c
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/x68k/x68k/locore.s
cvs rdiff -u -r1.165 -r1.166 src/sys/arch/x68k/x68k/machdep.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/x68k/x68k/pmap_bootstrap.c
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/x68k/x68k/trap.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/amiga/amiga/amiga_init.c
diff -u src/sys/arch/amiga/amiga/amiga_init.c:1.118 src/sys/arch/amiga/amiga/amiga_init.c:1.119
--- src/sys/arch/amiga/amiga/amiga_init.c:1.118 Sat Dec 12 13:10:36 2009
+++ src/sys/arch/amiga/amiga/amiga_init.c Sun Jun 6 04:50:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: amiga_init.c,v 1.118 2009/12/12 13:10:36 phx Exp $ */
+/* $NetBSD: amiga_init.c,v 1.119 2010/06/06 04:50:05 mrg Exp $ */
/*
* Copyright (c) 1994 Michael L. Hitch
@@ -34,9 +34,10 @@
#include "opt_amigaccgrf.h"
#include "opt_p5ppc68kboard.h"
#include "opt_devreload.h"
+#include "opt_m68k_arch.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amiga_init.c,v 1.118 2009/12/12 13:10:36 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amiga_init.c,v 1.119 2010/06/06 04:50:05 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/amiga/amiga/locore.s
diff -u src/sys/arch/amiga/amiga/locore.s:1.149 src/sys/arch/amiga/amiga/locore.s:1.150
--- src/sys/arch/amiga/amiga/locore.s:1.149 Sat Dec 12 13:10:36 2009
+++ src/sys/arch/amiga/amiga/locore.s Sun Jun 6 04:50:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.149 2009/12/12 13:10:36 phx Exp $ */
+/* $NetBSD: locore.s,v 1.150 2010/06/06 04:50:05 mrg Exp $ */
/*
* Copyright (c) 1980, 1990 The Regents of the University of California.
@@ -94,8 +94,8 @@
#include "opt_fpsp.h"
#include "opt_kgdb.h"
#include "opt_lockdebug.h"
-
#include "opt_lev6_defer.h"
+#include "opt_m68k_arch.h"
#include "assym.h"
#include <machine/asm.h>
Index: src/sys/arch/amiga/amiga/machdep.c
diff -u src/sys/arch/amiga/amiga/machdep.c:1.225 src/sys/arch/amiga/amiga/machdep.c:1.226
--- src/sys/arch/amiga/amiga/machdep.c:1.225 Mon Feb 8 19:02:26 2010
+++ src/sys/arch/amiga/amiga/machdep.c Sun Jun 6 04:50:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.225 2010/02/08 19:02:26 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.226 2010/06/06 04:50:05 mrg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -84,9 +84,10 @@
#include "opt_m060sp.h"
#include "opt_modular.h"
#include "opt_panicbutton.h"
+#include "opt_m68k_arch.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.225 2010/02/08 19:02:26 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.226 2010/06/06 04:50:05 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/amiga/amiga/trap.c
diff -u src/sys/arch/amiga/amiga/trap.c:1.128 src/sys/arch/amiga/amiga/trap.c:1.129
--- src/sys/arch/amiga/amiga/trap.c:1.128 Sat Mar 20 23:31:27 2010
+++ src/sys/arch/amiga/amiga/trap.c Sun Jun 6 04:50:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.128 2010/03/20 23:31:27 chs Exp $ */
+/* $NetBSD: trap.c,v 1.129 2010/06/06 04:50:05 mrg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -81,9 +81,10 @@
#include "opt_execfmt.h"
#include "opt_compat_sunos.h"
#include "opt_fpu_emulate.h"
+#include "opt_m68k_arch.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.128 2010/03/20 23:31:27 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.129 2010/06/06 04:50:05 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/amiga/dev/bzivsc.c
diff -u src/sys/arch/amiga/dev/bzivsc.c:1.28 src/sys/arch/amiga/dev/bzivsc.c:1.29
--- src/sys/arch/amiga/dev/bzivsc.c:1.28 Mon Nov 23 00:11:43 2009
+++ src/sys/arch/amiga/dev/bzivsc.c Sun Jun 6 04:50:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bzivsc.c,v 1.28 2009/11/23 00:11:43 rmind Exp $ */
+/* $NetBSD: bzivsc.c,v 1.29 2010/06/06 04:50:06 mrg Exp $ */
/*
* Copyright (c) 1997 Michael L. Hitch
@@ -31,8 +31,10 @@
*
*/
+#include "opt_m68k_arch.h"
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bzivsc.c,v 1.28 2009/11/23 00:11:43 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bzivsc.c,v 1.29 2010/06/06 04:50:06 mrg Exp $");
#include <sys/types.h>
#include <sys/param.h>
Index: src/sys/arch/amiga/dev/bzsc.c
diff -u src/sys/arch/amiga/dev/bzsc.c:1.45 src/sys/arch/amiga/dev/bzsc.c:1.46
--- src/sys/arch/amiga/dev/bzsc.c:1.45 Mon Nov 23 00:11:43 2009
+++ src/sys/arch/amiga/dev/bzsc.c Sun Jun 6 04:50:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bzsc.c,v 1.45 2009/11/23 00:11:43 rmind Exp $ */
+/* $NetBSD: bzsc.c,v 1.46 2010/06/06 04:50:06 mrg Exp $ */
/*
* Copyright (c) 1997 Michael L. Hitch
@@ -36,8 +36,10 @@
* SUCH DAMAGE.
*/
+#include "opt_m68k_arch.h"
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bzsc.c,v 1.45 2009/11/23 00:11:43 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bzsc.c,v 1.46 2010/06/06 04:50:06 mrg Exp $");
/*
* Initial amiga Blizzard 1230-II driver by Daniel Widenfalk. Conversion to
Index: src/sys/arch/amiga/dev/bztzsc.c
diff -u src/sys/arch/amiga/dev/bztzsc.c:1.33 src/sys/arch/amiga/dev/bztzsc.c:1.34
--- src/sys/arch/amiga/dev/bztzsc.c:1.33 Mon Nov 23 00:11:43 2009
+++ src/sys/arch/amiga/dev/bztzsc.c Sun Jun 6 04:50:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bztzsc.c,v 1.33 2009/11/23 00:11:43 rmind Exp $ */
+/* $NetBSD: bztzsc.c,v 1.34 2010/06/06 04:50:06 mrg Exp $ */
/*
* Copyright (c) 1997 Michael L. Hitch
@@ -37,8 +37,10 @@
* 53c9x MI driver by Michael L. Hitch (mhi...@montana.edu).
*/
+#include "opt_m68k_arch.h"
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bztzsc.c,v 1.33 2009/11/23 00:11:43 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bztzsc.c,v 1.34 2010/06/06 04:50:06 mrg Exp $");
#include <sys/types.h>
#include <sys/param.h>
Index: src/sys/arch/amiga/dev/cbiisc.c
diff -u src/sys/arch/amiga/dev/cbiisc.c:1.29 src/sys/arch/amiga/dev/cbiisc.c:1.30
--- src/sys/arch/amiga/dev/cbiisc.c:1.29 Mon Nov 23 00:11:43 2009
+++ src/sys/arch/amiga/dev/cbiisc.c Sun Jun 6 04:50:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cbiisc.c,v 1.29 2009/11/23 00:11:43 rmind Exp $ */
+/* $NetBSD: cbiisc.c,v 1.30 2010/06/06 04:50:06 mrg Exp $ */
/*
* Copyright (c) 1997 Michael L. Hitch
@@ -31,8 +31,10 @@
*
*/
+#include "opt_m68k_arch.h"
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cbiisc.c,v 1.29 2009/11/23 00:11:43 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cbiisc.c,v 1.30 2010/06/06 04:50:06 mrg Exp $");
#include <sys/types.h>
#include <sys/param.h>
Index: src/sys/arch/amiga/dev/cbsc.c
diff -u src/sys/arch/amiga/dev/cbsc.c:1.30 src/sys/arch/amiga/dev/cbsc.c:1.31
--- src/sys/arch/amiga/dev/cbsc.c:1.30 Mon Nov 23 00:11:43 2009
+++ src/sys/arch/amiga/dev/cbsc.c Sun Jun 6 04:50:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cbsc.c,v 1.30 2009/11/23 00:11:43 rmind Exp $ */
+/* $NetBSD: cbsc.c,v 1.31 2010/06/06 04:50:06 mrg Exp $ */
/*
* Copyright (c) 1997 Michael L. Hitch
@@ -31,8 +31,10 @@
*
*/
+#include "opt_m68k_arch.h"
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cbsc.c,v 1.30 2009/11/23 00:11:43 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cbsc.c,v 1.31 2010/06/06 04:50:06 mrg Exp $");
#include <sys/types.h>
#include <sys/param.h>
Index: src/sys/arch/amiga/dev/flsc.c
diff -u src/sys/arch/amiga/dev/flsc.c:1.42 src/sys/arch/amiga/dev/flsc.c:1.43
--- src/sys/arch/amiga/dev/flsc.c:1.42 Mon Nov 23 00:11:43 2009
+++ src/sys/arch/amiga/dev/flsc.c Sun Jun 6 04:50:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: flsc.c,v 1.42 2009/11/23 00:11:43 rmind Exp $ */
+/* $NetBSD: flsc.c,v 1.43 2010/06/06 04:50:06 mrg Exp $ */
/*
* Copyright (c) 1997 Michael L. Hitch
@@ -42,9 +42,10 @@
*/
#include "opt_ddb.h"
+#include "opt_m68k_arch.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: flsc.c,v 1.42 2009/11/23 00:11:43 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flsc.c,v 1.43 2010/06/06 04:50:06 mrg Exp $");
#include <sys/types.h>
#include <sys/param.h>
Index: src/sys/arch/amiga/dev/if_bah_zbus.c
diff -u src/sys/arch/amiga/dev/if_bah_zbus.c:1.11 src/sys/arch/amiga/dev/if_bah_zbus.c:1.12
--- src/sys/arch/amiga/dev/if_bah_zbus.c:1.11 Mon Apr 28 20:23:12 2008
+++ src/sys/arch/amiga/dev/if_bah_zbus.c Sun Jun 6 04:50:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bah_zbus.c,v 1.11 2008/04/28 20:23:12 martin Exp $ */
+/* $NetBSD: if_bah_zbus.c,v 1.12 2010/06/06 04:50:06 mrg Exp $ */
/*-
* Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
@@ -29,8 +29,10 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include "opt_m68k_arch.h"
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bah_zbus.c,v 1.11 2008/04/28 20:23:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bah_zbus.c,v 1.12 2010/06/06 04:50:06 mrg Exp $");
/*
* Driver frontend for the Commodore Busines Machines and the
Index: src/sys/arch/amiga/dev/sbic.c
diff -u src/sys/arch/amiga/dev/sbic.c:1.66 src/sys/arch/amiga/dev/sbic.c:1.67
--- src/sys/arch/amiga/dev/sbic.c:1.66 Fri Feb 5 12:13:36 2010
+++ src/sys/arch/amiga/dev/sbic.c Sun Jun 6 04:50:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sbic.c,v 1.66 2010/02/05 12:13:36 phx Exp $ */
+/* $NetBSD: sbic.c,v 1.67 2010/06/06 04:50:06 mrg Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -76,9 +76,10 @@
*/
#include "opt_ddb.h"
+#include "opt_m68k_arch.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbic.c,v 1.66 2010/02/05 12:13:36 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbic.c,v 1.67 2010/06/06 04:50:06 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/atari/atari/atari_init.c
diff -u src/sys/arch/atari/atari/atari_init.c:1.93 src/sys/arch/atari/atari/atari_init.c:1.94
--- src/sys/arch/atari/atari/atari_init.c:1.93 Tue Apr 13 11:22:22 2010
+++ src/sys/arch/atari/atari/atari_init.c Sun Jun 6 04:50:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: atari_init.c,v 1.93 2010/04/13 11:22:22 tsutsui Exp $ */
+/* $NetBSD: atari_init.c,v 1.94 2010/06/06 04:50:06 mrg Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -33,11 +33,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.93 2010/04/13 11:22:22 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.94 2010/06/06 04:50:06 mrg Exp $");
#include "opt_ddb.h"
#include "opt_mbtype.h"
#include "opt_m060sp.h"
+#include "opt_m68k_arch.h"
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/atari/atari/bus.c
diff -u src/sys/arch/atari/atari/bus.c:1.53 src/sys/arch/atari/atari/bus.c:1.54
--- src/sys/arch/atari/atari/bus.c:1.53 Tue Apr 13 11:22:22 2010
+++ src/sys/arch/atari/atari/bus.c Sun Jun 6 04:50:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.c,v 1.53 2010/04/13 11:22:22 tsutsui Exp $ */
+/* $NetBSD: bus.c,v 1.54 2010/06/06 04:50:06 mrg Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,8 +30,10 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include "opt_m68k_arch.h"
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.53 2010/04/13 11:22:22 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.54 2010/06/06 04:50:06 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/atari/atari/locore.s
diff -u src/sys/arch/atari/atari/locore.s:1.105 src/sys/arch/atari/atari/locore.s:1.106
--- src/sys/arch/atari/atari/locore.s:1.105 Fri Apr 9 17:38:43 2010
+++ src/sys/arch/atari/atari/locore.s Sun Jun 6 04:50:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.105 2010/04/09 17:38:43 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.106 2010/06/06 04:50:06 mrg Exp $ */
/*
* Copyright (c) 1980, 1990 The Regents of the University of California.
@@ -91,6 +91,8 @@
#include "opt_kgdb.h"
#include "opt_lockdebug.h"
#include "opt_mbtype.h"
+#include "opt_m68k_arch.h"
+
#include "kbd.h"
#include "ncrscsi.h"
#include "zs.h"
Index: src/sys/arch/atari/atari/trap.c
diff -u src/sys/arch/atari/atari/trap.c:1.106 src/sys/arch/atari/atari/trap.c:1.107
--- src/sys/arch/atari/atari/trap.c:1.106 Sat Mar 20 23:31:27 2010
+++ src/sys/arch/atari/atari/trap.c Sun Jun 6 04:50:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.106 2010/03/20 23:31:27 chs Exp $ */
+/* $NetBSD: trap.c,v 1.107 2010/06/06 04:50:06 mrg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -77,13 +77,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.106 2010/03/20 23:31:27 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.107 2010/06/06 04:50:06 mrg Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
#include "opt_kgdb.h"
#include "opt_compat_sunos.h"
#include "opt_fpu_emulate.h"
+#include "opt_m68k_arch.h"
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/cesfic/cesfic/locore.s
diff -u src/sys/arch/cesfic/cesfic/locore.s:1.22 src/sys/arch/cesfic/cesfic/locore.s:1.23
--- src/sys/arch/cesfic/cesfic/locore.s:1.22 Thu Feb 25 07:15:25 2010
+++ src/sys/arch/cesfic/cesfic/locore.s Sun Jun 6 04:50:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.22 2010/02/25 07:15:25 skrll Exp $ */
+/* $NetBSD: locore.s,v 1.23 2010/06/06 04:50:06 mrg Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -84,6 +84,7 @@
#include "opt_ddb.h"
#include "opt_fpsp.h"
#include "opt_fpu_emulate.h"
+#include "opt_m68k_arch.h"
#include "ksyms.h"
#include "assym.h"
Index: src/sys/arch/cesfic/cesfic/trap.c
diff -u src/sys/arch/cesfic/cesfic/trap.c:1.50 src/sys/arch/cesfic/cesfic/trap.c:1.51
--- src/sys/arch/cesfic/cesfic/trap.c:1.50 Sat Mar 20 23:31:28 2010
+++ src/sys/arch/cesfic/cesfic/trap.c Sun Jun 6 04:50:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.50 2010/03/20 23:31:28 chs Exp $ */
+/* $NetBSD: trap.c,v 1.51 2010/06/06 04:50:06 mrg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.50 2010/03/20 23:31:28 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.51 2010/06/06 04:50:06 mrg Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -85,6 +85,7 @@
#include "opt_compat_netbsd.h"
#include "opt_compat_sunos.h"
#include "opt_compat_linux.h"
+#include "opt_m68k_arch.h"
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/cesfic/include/cpu.h
diff -u src/sys/arch/cesfic/include/cpu.h:1.23 src/sys/arch/cesfic/include/cpu.h:1.24
--- src/sys/arch/cesfic/include/cpu.h:1.23 Wed Oct 21 21:11:59 2009
+++ src/sys/arch/cesfic/include/cpu.h Sun Jun 6 04:50:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.23 2009/10/21 21:11:59 rmind Exp $ */
+/* $NetBSD: cpu.h,v 1.24 2010/06/06 04:50:06 mrg Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@@ -83,6 +83,7 @@
#if defined(_KERNEL_OPT)
#include "opt_lockdebug.h"
+#include "opt_m68k_arch.h"
#endif
/*
Index: src/sys/arch/hp300/dev/dma.c
diff -u src/sys/arch/hp300/dev/dma.c:1.42 src/sys/arch/hp300/dev/dma.c:1.43
--- src/sys/arch/hp300/dev/dma.c:1.42 Sun Jun 22 16:29:36 2008
+++ src/sys/arch/hp300/dev/dma.c Sun Jun 6 04:50:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dma.c,v 1.42 2008/06/22 16:29:36 tsutsui Exp $ */
+/* $NetBSD: dma.c,v 1.43 2010/06/06 04:50:06 mrg Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -64,8 +64,10 @@
* DMA driver
*/
+#include "opt_m68k_arch.h"
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.42 2008/06/22 16:29:36 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.43 2010/06/06 04:50:06 mrg Exp $");
#include <machine/hp300spu.h> /* XXX param.h includes cpu.h */
Index: src/sys/arch/hp300/hp300/locore.s
diff -u src/sys/arch/hp300/hp300/locore.s:1.153 src/sys/arch/hp300/hp300/locore.s:1.154
--- src/sys/arch/hp300/hp300/locore.s:1.153 Thu Feb 25 07:17:49 2010
+++ src/sys/arch/hp300/hp300/locore.s Sun Jun 6 04:50:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.153 2010/02/25 07:17:49 skrll Exp $ */
+/* $NetBSD: locore.s,v 1.154 2010/06/06 04:50:06 mrg Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -86,6 +86,7 @@
#include "opt_kgdb.h"
#include "opt_lockdebug.h"
#include "opt_fpu_emulate.h"
+#include "opt_m68k_arch.h"
#include "assym.h"
#include <machine/asm.h>
Index: src/sys/arch/hp300/hp300/trap.c
diff -u src/sys/arch/hp300/hp300/trap.c:1.142 src/sys/arch/hp300/hp300/trap.c:1.143
--- src/sys/arch/hp300/hp300/trap.c:1.142 Sat Mar 20 23:31:28 2010
+++ src/sys/arch/hp300/hp300/trap.c Sun Jun 6 04:50:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.142 2010/03/20 23:31:28 chs Exp $ */
+/* $NetBSD: trap.c,v 1.143 2010/06/06 04:50:06 mrg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -77,12 +77,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.142 2010/03/20 23:31:28 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.143 2010/06/06 04:50:06 mrg Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
#include "opt_kgdb.h"
#include "opt_compat_sunos.h"
+#include "opt_m68k_arch.h"
#include <machine/hp300spu.h> /* XXX param.h includes cpu.h */
Index: src/sys/arch/hp300/include/hp300spu.h
diff -u src/sys/arch/hp300/include/hp300spu.h:1.13 src/sys/arch/hp300/include/hp300spu.h:1.14
--- src/sys/arch/hp300/include/hp300spu.h:1.13 Mon Apr 28 20:23:19 2008
+++ src/sys/arch/hp300/include/hp300spu.h Sun Jun 6 04:50:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hp300spu.h,v 1.13 2008/04/28 20:23:19 martin Exp $ */
+/* $NetBSD: hp300spu.h,v 1.14 2010/06/06 04:50:06 mrg Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -86,6 +86,7 @@
*/
#if defined(_KERNEL_OPT)
#include "opt_spuconf.h"
+#include "opt_m68k_arch.h"
#endif
/*
Index: src/sys/arch/luna68k/luna68k/locore.s
diff -u src/sys/arch/luna68k/luna68k/locore.s:1.34 src/sys/arch/luna68k/luna68k/locore.s:1.35
--- src/sys/arch/luna68k/luna68k/locore.s:1.34 Thu Feb 25 07:17:48 2010
+++ src/sys/arch/luna68k/luna68k/locore.s Sun Jun 6 04:50:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.34 2010/02/25 07:17:48 skrll Exp $ */
+/* $NetBSD: locore.s,v 1.35 2010/06/06 04:50:06 mrg Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -83,6 +83,7 @@
#include "opt_lockdebug.h"
#include "opt_compat_sunos.h"
#include "opt_fpu_emulate.h"
+#include "opt_m68k_arch.h"
#include "assym.h"
#include <machine/asm.h>
Index: src/sys/arch/luna68k/luna68k/machdep.c
diff -u src/sys/arch/luna68k/luna68k/machdep.c:1.74 src/sys/arch/luna68k/luna68k/machdep.c:1.75
--- src/sys/arch/luna68k/luna68k/machdep.c:1.74 Mon Feb 8 19:02:30 2010
+++ src/sys/arch/luna68k/luna68k/machdep.c Sun Jun 6 04:50:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.74 2010/02/08 19:02:30 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.75 2010/06/06 04:50:06 mrg Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,13 +31,14 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.74 2010/02/08 19:02:30 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.75 2010/06/06 04:50:06 mrg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_compat_sunos.h"
#include "opt_modular.h"
#include "opt_panicbutton.h"
+#include "opt_m68k_arch.h"
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/luna68k/luna68k/pmap_bootstrap.c
diff -u src/sys/arch/luna68k/luna68k/pmap_bootstrap.c:1.27 src/sys/arch/luna68k/luna68k/pmap_bootstrap.c:1.28
--- src/sys/arch/luna68k/luna68k/pmap_bootstrap.c:1.27 Fri Dec 11 22:23:09 2009
+++ src/sys/arch/luna68k/luna68k/pmap_bootstrap.c Sun Jun 6 04:50:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.27 2009/12/11 22:23:09 tsutsui Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.28 2010/06/06 04:50:06 mrg Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -35,8 +35,10 @@
* @(#)pmap_bootstrap.c 8.1 (Berkeley) 6/10/93
*/
+#include "opt_m68k_arch.h"
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.27 2009/12/11 22:23:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.28 2010/06/06 04:50:06 mrg Exp $");
#include <sys/param.h>
Index: src/sys/arch/luna68k/luna68k/trap.c
diff -u src/sys/arch/luna68k/luna68k/trap.c:1.62 src/sys/arch/luna68k/luna68k/trap.c:1.63
--- src/sys/arch/luna68k/luna68k/trap.c:1.62 Sat Mar 20 23:31:28 2010
+++ src/sys/arch/luna68k/luna68k/trap.c Sun Jun 6 04:50:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.62 2010/03/20 23:31:28 chs Exp $ */
+/* $NetBSD: trap.c,v 1.63 2010/06/06 04:50:06 mrg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -78,11 +78,12 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.62 2010/03/20 23:31:28 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.63 2010/06/06 04:50:06 mrg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_execfmt.h"
+#include "opt_m68k_arch.h"
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/m68k/fpe/fpu_calcea.c
diff -u src/sys/arch/m68k/fpe/fpu_calcea.c:1.21 src/sys/arch/m68k/fpe/fpu_calcea.c:1.22
--- src/sys/arch/m68k/fpe/fpu_calcea.c:1.21 Sat Mar 14 21:04:11 2009
+++ src/sys/arch/m68k/fpe/fpu_calcea.c Sun Jun 6 04:50:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_calcea.c,v 1.21 2009/03/14 21:04:11 dsl Exp $ */
+/* $NetBSD: fpu_calcea.c,v 1.22 2010/06/06 04:50:07 mrg Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -31,8 +31,10 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "opt_m68k_arch.h"
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_calcea.c,v 1.21 2009/03/14 21:04:11 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_calcea.c,v 1.22 2010/06/06 04:50:07 mrg Exp $");
#include <sys/param.h>
#include <sys/signal.h>
Index: src/sys/arch/m68k/include/cacheops.h
diff -u src/sys/arch/m68k/include/cacheops.h:1.15 src/sys/arch/m68k/include/cacheops.h:1.16
--- src/sys/arch/m68k/include/cacheops.h:1.15 Mon Apr 28 20:23:26 2008
+++ src/sys/arch/m68k/include/cacheops.h Sun Jun 6 04:50:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cacheops.h,v 1.15 2008/04/28 20:23:26 martin Exp $ */
+/* $NetBSD: cacheops.h,v 1.16 2010/06/06 04:50:07 mrg Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef _M68K_CACHEOPS_H_
#define _M68K_CACHEOPS_H_
+#include "opt_m68k_arch.h"
+
#if notyet /* XXX */
#include <machine/cpuconf.h>
#endif
Index: src/sys/arch/m68k/include/pmap_motorola.h
diff -u src/sys/arch/m68k/include/pmap_motorola.h:1.28 src/sys/arch/m68k/include/pmap_motorola.h:1.29
--- src/sys/arch/m68k/include/pmap_motorola.h:1.28 Sun Dec 13 12:32:46 2009
+++ src/sys/arch/m68k/include/pmap_motorola.h Sun Jun 6 04:50:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_motorola.h,v 1.28 2009/12/13 12:32:46 tsutsui Exp $ */
+/* $NetBSD: pmap_motorola.h,v 1.29 2010/06/06 04:50:07 mrg Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -76,6 +76,8 @@
#ifndef _M68K_PMAP_MOTOROLA_H_
#define _M68K_PMAP_MOTOROLA_H_
+#include "opt_m68k_arch.h"
+
#include <sys/simplelock.h>
#include <machine/cpu.h>
#include <machine/pte.h>
Index: src/sys/arch/m68k/m68k/bus_dma.c
diff -u src/sys/arch/m68k/m68k/bus_dma.c:1.29 src/sys/arch/m68k/m68k/bus_dma.c:1.30
--- src/sys/arch/m68k/m68k/bus_dma.c:1.29 Wed Jun 4 12:41:41 2008
+++ src/sys/arch/m68k/m68k/bus_dma.c Sun Jun 6 04:50:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.29 2008/06/04 12:41:41 ad Exp $ */
+/* $NetBSD: bus_dma.c,v 1.30 2010/06/06 04:50:07 mrg Exp $ */
/*
* This file was taken from from alpha/common/bus_dma.c
@@ -37,9 +37,11 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include "opt_m68k_arch.h"
+
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.29 2008/06/04 12:41:41 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.30 2010/06/06 04:50:07 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/m68k/m68k/cacheops.c
diff -u src/sys/arch/m68k/m68k/cacheops.c:1.14 src/sys/arch/m68k/m68k/cacheops.c:1.15
--- src/sys/arch/m68k/m68k/cacheops.c:1.14 Mon Apr 28 20:23:27 2008
+++ src/sys/arch/m68k/m68k/cacheops.c Sun Jun 6 04:50:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cacheops.c,v 1.14 2008/04/28 20:23:27 martin Exp $ */
+/* $NetBSD: cacheops.c,v 1.15 2010/06/06 04:50:07 mrg Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -29,8 +29,10 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include "opt_m68k_arch.h"
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cacheops.c,v 1.14 2008/04/28 20:23:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cacheops.c,v 1.15 2010/06/06 04:50:07 mrg Exp $");
#include <sys/types.h>
#include <machine/cpu.h>
Index: src/sys/arch/m68k/m68k/sys_machdep.c
diff -u src/sys/arch/m68k/m68k/sys_machdep.c:1.14 src/sys/arch/m68k/m68k/sys_machdep.c:1.15
--- src/sys/arch/m68k/m68k/sys_machdep.c:1.14 Mon Dec 31 13:38:51 2007
+++ src/sys/arch/m68k/m68k/sys_machdep.c Sun Jun 6 04:50:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_machdep.c,v 1.14 2007/12/31 13:38:51 ad Exp $ */
+/* $NetBSD: sys_machdep.c,v 1.15 2010/06/06 04:50:07 mrg Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -31,6 +31,8 @@
* @(#)sys_machdep.c 8.2 (Berkeley) 1/13/94
*/
+#include "opt_m68k_arch.h"
+
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD");
Index: src/sys/arch/m68k/m68k/copypage.s
diff -u src/sys/arch/m68k/m68k/copypage.s:1.13 src/sys/arch/m68k/m68k/copypage.s:1.14
--- src/sys/arch/m68k/m68k/copypage.s:1.13 Mon Apr 28 20:23:27 2008
+++ src/sys/arch/m68k/m68k/copypage.s Sun Jun 6 04:50:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: copypage.s,v 1.13 2008/04/28 20:23:27 martin Exp $ */
+/* $NetBSD: copypage.s,v 1.14 2010/06/06 04:50:07 mrg Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -34,6 +34,8 @@
* Optimized functions for copying/clearing a whole page.
*/
+#include "opt_m68k_arch.h"
+
#include <machine/asm.h>
#include "assym.h"
Index: src/sys/arch/m68k/m68k/pmap_motorola.c
diff -u src/sys/arch/m68k/m68k/pmap_motorola.c:1.55 src/sys/arch/m68k/m68k/pmap_motorola.c:1.56
--- src/sys/arch/m68k/m68k/pmap_motorola.c:1.55 Fri Dec 11 18:28:35 2009
+++ src/sys/arch/m68k/m68k/pmap_motorola.c Sun Jun 6 04:50:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_motorola.c,v 1.55 2009/12/11 18:28:35 tsutsui Exp $ */
+/* $NetBSD: pmap_motorola.c,v 1.56 2010/06/06 04:50:07 mrg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -116,8 +116,10 @@
* and to when physical maps must be made correct.
*/
+#include "opt_m68k_arch.h"
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.55 2009/12/11 18:28:35 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.56 2010/06/06 04:50:07 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/m68k/m68k/sig_machdep.c
diff -u src/sys/arch/m68k/m68k/sig_machdep.c:1.42 src/sys/arch/m68k/m68k/sig_machdep.c:1.43
--- src/sys/arch/m68k/m68k/sig_machdep.c:1.42 Mon Nov 23 00:11:44 2009
+++ src/sys/arch/m68k/m68k/sig_machdep.c Sun Jun 6 04:50:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.42 2009/11/23 00:11:44 rmind Exp $ */
+/* $NetBSD: sig_machdep.c,v 1.43 2010/06/06 04:50:07 mrg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -74,8 +74,10 @@
* from: @(#)machdep.c 8.10 (Berkeley) 4/20/94
*/
+#include "opt_m68k_arch.h"
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.42 2009/11/23 00:11:44 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.43 2010/06/06 04:50:07 mrg Exp $");
#define __M68K_SIGNAL_PRIVATE
Index: src/sys/arch/m68k/m68k/switch_subr.s
diff -u src/sys/arch/m68k/m68k/switch_subr.s:1.23 src/sys/arch/m68k/m68k/switch_subr.s:1.24
--- src/sys/arch/m68k/m68k/switch_subr.s:1.23 Thu Dec 10 05:10:02 2009
+++ src/sys/arch/m68k/m68k/switch_subr.s Sun Jun 6 04:50:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: switch_subr.s,v 1.23 2009/12/10 05:10:02 rmind Exp $ */
+/* $NetBSD: switch_subr.s,v 1.24 2010/06/06 04:50:07 mrg Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation.
@@ -77,6 +77,7 @@
#include "opt_fpu_emulate.h"
#include "opt_lockdebug.h"
#include "opt_pmap_debug.h"
+#include "opt_m68k_arch.h"
/*
* NOTICE: This is not a standalone file. To use it, #include it in
Index: src/sys/arch/mac68k/mac68k/locore.s
diff -u src/sys/arch/mac68k/mac68k/locore.s:1.160 src/sys/arch/mac68k/mac68k/locore.s:1.161
--- src/sys/arch/mac68k/mac68k/locore.s:1.160 Thu Feb 25 07:17:48 2010
+++ src/sys/arch/mac68k/mac68k/locore.s Sun Jun 6 04:50:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.160 2010/02/25 07:17:48 skrll Exp $ */
+/* $NetBSD: locore.s,v 1.161 2010/06/06 04:50:07 mrg Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -114,8 +114,11 @@
#include "opt_fpu_emulate.h"
#include "opt_kgdb.h"
#include "opt_lockdebug.h"
-#include "assym.h"
#include "opt_fpsp.h"
+#include "opt_m68k_arch.h"
+
+#include "assym.h"
+
#include <machine/asm.h>
#include <machine/trap.h>
Index: src/sys/arch/mac68k/mac68k/pmap_bootstrap.c
diff -u src/sys/arch/mac68k/mac68k/pmap_bootstrap.c:1.88 src/sys/arch/mac68k/mac68k/pmap_bootstrap.c:1.89
--- src/sys/arch/mac68k/mac68k/pmap_bootstrap.c:1.88 Tue Mar 2 15:01:04 2010
+++ src/sys/arch/mac68k/mac68k/pmap_bootstrap.c Sun Jun 6 04:50:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.88 2010/03/02 15:01:04 tsutsui Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.89 2010/06/06 04:50:07 mrg Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -36,10 +36,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.88 2010/03/02 15:01:04 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.89 2010/06/06 04:50:07 mrg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
+#include "opt_m68k_arch.h"
+
#include "zsc.h"
#include <sys/param.h>
Index: src/sys/arch/mac68k/mac68k/trap.c
diff -u src/sys/arch/mac68k/mac68k/trap.c:1.140 src/sys/arch/mac68k/mac68k/trap.c:1.141
--- src/sys/arch/mac68k/mac68k/trap.c:1.140 Sat Mar 20 23:31:28 2010
+++ src/sys/arch/mac68k/mac68k/trap.c Sun Jun 6 04:50:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.140 2010/03/20 23:31:28 chs Exp $ */
+/* $NetBSD: trap.c,v 1.141 2010/06/06 04:50:07 mrg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -77,13 +77,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.140 2010/03/20 23:31:28 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.141 2010/06/06 04:50:07 mrg Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
#include "opt_fpu_emulate.h"
#include "opt_kgdb.h"
#include "opt_compat_sunos.h"
+#include "opt_m68k_arch.h"
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/mvme68k/include/cpu.h
diff -u src/sys/arch/mvme68k/include/cpu.h:1.43 src/sys/arch/mvme68k/include/cpu.h:1.44
--- src/sys/arch/mvme68k/include/cpu.h:1.43 Wed Oct 21 21:12:01 2009
+++ src/sys/arch/mvme68k/include/cpu.h Sun Jun 6 04:50:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.43 2009/10/21 21:12:01 rmind Exp $ */
+/* $NetBSD: cpu.h,v 1.44 2010/06/06 04:50:07 mrg Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@@ -87,6 +87,7 @@
#if defined(_KERNEL_OPT)
#include "opt_lockdebug.h"
+#include "opt_m68k_arch.h"
#endif
/*
Index: src/sys/arch/mvme68k/mvme68k/locore.s
diff -u src/sys/arch/mvme68k/mvme68k/locore.s:1.105 src/sys/arch/mvme68k/mvme68k/locore.s:1.106
--- src/sys/arch/mvme68k/mvme68k/locore.s:1.105 Thu Feb 25 07:17:48 2010
+++ src/sys/arch/mvme68k/mvme68k/locore.s Sun Jun 6 04:50:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.105 2010/02/25 07:17:48 skrll Exp $ */
+/* $NetBSD: locore.s,v 1.106 2010/06/06 04:50:07 mrg Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -83,6 +83,7 @@
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_lockdebug.h"
+#include "opt_m68k_arch.h"
#include "assym.h"
#include <machine/asm.h>
Index: src/sys/arch/mvme68k/mvme68k/machdep.c
diff -u src/sys/arch/mvme68k/mvme68k/machdep.c:1.142 src/sys/arch/mvme68k/mvme68k/machdep.c:1.143
--- src/sys/arch/mvme68k/mvme68k/machdep.c:1.142 Mon Feb 8 19:02:30 2010
+++ src/sys/arch/mvme68k/mvme68k/machdep.c Sun Jun 6 04:50:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.142 2010/02/08 19:02:30 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.143 2010/06/06 04:50:07 mrg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -77,12 +77,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.142 2010/02/08 19:02:30 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.143 2010/06/06 04:50:07 mrg Exp $");
#include "opt_ddb.h"
#include "opt_m060sp.h"
#include "opt_modular.h"
#include "opt_panicbutton.h"
+#include "opt_m68k_arch.h"
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c
diff -u src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.40 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.41
--- src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.40 Fri Dec 11 22:23:09 2009
+++ src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c Sun Jun 6 04:50:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.40 2009/12/11 22:23:09 tsutsui Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.41 2010/06/06 04:50:07 mrg Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -35,8 +35,10 @@
* @(#)pmap_bootstrap.c 8.1 (Berkeley) 6/10/93
*/
+#include "opt_m68k_arch.h"
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.40 2009/12/11 22:23:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.41 2010/06/06 04:50:07 mrg Exp $");
#include <sys/param.h>
#include <sys/kcore.h>
Index: src/sys/arch/mvme68k/mvme68k/trap.c
diff -u src/sys/arch/mvme68k/mvme68k/trap.c:1.100 src/sys/arch/mvme68k/mvme68k/trap.c:1.101
--- src/sys/arch/mvme68k/mvme68k/trap.c:1.100 Sat Mar 20 23:31:28 2010
+++ src/sys/arch/mvme68k/mvme68k/trap.c Sun Jun 6 04:50:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.100 2010/03/20 23:31:28 chs Exp $ */
+/* $NetBSD: trap.c,v 1.101 2010/06/06 04:50:07 mrg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -77,12 +77,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.100 2010/03/20 23:31:28 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.101 2010/06/06 04:50:07 mrg Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
#include "opt_kgdb.h"
#include "opt_compat_sunos.h"
+#include "opt_m68k_arch.h"
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/news68k/include/cpu.h
diff -u src/sys/arch/news68k/include/cpu.h:1.35 src/sys/arch/news68k/include/cpu.h:1.36
--- src/sys/arch/news68k/include/cpu.h:1.35 Wed Oct 21 21:12:01 2009
+++ src/sys/arch/news68k/include/cpu.h Sun Jun 6 04:50:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.35 2009/10/21 21:12:01 rmind Exp $ */
+/* $NetBSD: cpu.h,v 1.36 2010/06/06 04:50:07 mrg Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@@ -87,6 +87,7 @@
#if defined(_KERNEL_OPT)
#include "opt_lockdebug.h"
+#include "opt_m68k_arch.h"
#endif
/*
Index: src/sys/arch/news68k/news68k/locore.s
diff -u src/sys/arch/news68k/news68k/locore.s:1.53 src/sys/arch/news68k/news68k/locore.s:1.54
--- src/sys/arch/news68k/news68k/locore.s:1.53 Thu Feb 25 07:17:49 2010
+++ src/sys/arch/news68k/news68k/locore.s Sun Jun 6 04:50:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.53 2010/02/25 07:17:49 skrll Exp $ */
+/* $NetBSD: locore.s,v 1.54 2010/06/06 04:50:07 mrg Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -88,6 +88,7 @@
#include "opt_kgdb.h"
#include "opt_lockdebug.h"
#include "opt_fpu_emulate.h"
+#include "opt_m68k_arch.h"
#include "assym.h"
#include <machine/asm.h>
Index: src/sys/arch/news68k/news68k/pmap_bootstrap.c
diff -u src/sys/arch/news68k/news68k/pmap_bootstrap.c:1.31 src/sys/arch/news68k/news68k/pmap_bootstrap.c:1.32
--- src/sys/arch/news68k/news68k/pmap_bootstrap.c:1.31 Sun Dec 27 15:24:55 2009
+++ src/sys/arch/news68k/news68k/pmap_bootstrap.c Sun Jun 6 04:50:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.31 2009/12/27 15:24:55 tsutsui Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.32 2010/06/06 04:50:07 mrg Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -38,8 +38,10 @@
* news68k/pmap_bootstrap.c - from hp300 and mvme68k
*/
+#include "opt_m68k_arch.h"
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.31 2009/12/27 15:24:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.32 2010/06/06 04:50:07 mrg Exp $");
#include <sys/param.h>
Index: src/sys/arch/news68k/news68k/trap.c
diff -u src/sys/arch/news68k/news68k/trap.c:1.62 src/sys/arch/news68k/news68k/trap.c:1.63
--- src/sys/arch/news68k/news68k/trap.c:1.62 Sat Mar 20 23:31:28 2010
+++ src/sys/arch/news68k/news68k/trap.c Sun Jun 6 04:50:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.62 2010/03/20 23:31:28 chs Exp $ */
+/* $NetBSD: trap.c,v 1.63 2010/06/06 04:50:07 mrg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -77,12 +77,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.62 2010/03/20 23:31:28 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.63 2010/06/06 04:50:07 mrg Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
#include "opt_kgdb.h"
#include "opt_compat_sunos.h"
+#include "opt_m68k_arch.h"
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/next68k/include/cpu.h
diff -u src/sys/arch/next68k/include/cpu.h:1.41 src/sys/arch/next68k/include/cpu.h:1.42
--- src/sys/arch/next68k/include/cpu.h:1.41 Wed Oct 21 21:12:01 2009
+++ src/sys/arch/next68k/include/cpu.h Sun Jun 6 04:50:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.41 2009/10/21 21:12:01 rmind Exp $ */
+/* $NetBSD: cpu.h,v 1.42 2010/06/06 04:50:08 mrg Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@@ -84,6 +84,7 @@
#if defined(_KERNEL_OPT)
#include "opt_lockdebug.h"
+#include "opt_m68k_arch.h"
#endif
/*
Index: src/sys/arch/next68k/next68k/locore.s
diff -u src/sys/arch/next68k/next68k/locore.s:1.55 src/sys/arch/next68k/next68k/locore.s:1.56
--- src/sys/arch/next68k/next68k/locore.s:1.55 Thu Feb 25 07:17:49 2010
+++ src/sys/arch/next68k/next68k/locore.s Sun Jun 6 04:50:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.55 2010/02/25 07:17:49 skrll Exp $ */
+/* $NetBSD: locore.s,v 1.56 2010/06/06 04:50:08 mrg Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
@@ -93,6 +93,7 @@
#include "opt_lockdebug.h"
#include "opt_fpu_emulate.h"
#include "opt_useleds.h"
+#include "opt_m68k_arch.h"
#include "assym.h"
#include <machine/asm.h>
Index: src/sys/arch/next68k/next68k/pmap_bootstrap.c
diff -u src/sys/arch/next68k/next68k/pmap_bootstrap.c:1.35 src/sys/arch/next68k/next68k/pmap_bootstrap.c:1.36
--- src/sys/arch/next68k/next68k/pmap_bootstrap.c:1.35 Fri Dec 11 22:23:09 2009
+++ src/sys/arch/next68k/next68k/pmap_bootstrap.c Sun Jun 6 04:50:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.35 2009/12/11 22:23:09 tsutsui Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.36 2010/06/06 04:50:08 mrg Exp $ */
/*
* This file was taken from mvme68k/mvme68k/pmap_bootstrap.c
@@ -44,8 +44,10 @@
* @(#)pmap_bootstrap.c 8.1 (Berkeley) 6/10/93
*/
+#include "opt_m68k_arch.h"
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.35 2009/12/11 22:23:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.36 2010/06/06 04:50:08 mrg Exp $");
#include <sys/param.h>
#include <sys/kcore.h>
Index: src/sys/arch/next68k/next68k/trap.c
diff -u src/sys/arch/next68k/next68k/trap.c:1.79 src/sys/arch/next68k/next68k/trap.c:1.80
--- src/sys/arch/next68k/next68k/trap.c:1.79 Sat Mar 20 23:31:29 2010
+++ src/sys/arch/next68k/next68k/trap.c Sun Jun 6 04:50:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.79 2010/03/20 23:31:29 chs Exp $ */
+/* $NetBSD: trap.c,v 1.80 2010/06/06 04:50:08 mrg Exp $ */
/*
* This file was taken from mvme68k/mvme68k/trap.c
@@ -84,12 +84,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.79 2010/03/20 23:31:29 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.80 2010/06/06 04:50:08 mrg Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
#include "opt_kgdb.h"
#include "opt_compat_sunos.h"
+#include "opt_m68k_arch.h"
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/x68k/dev/intio_dmac.c
diff -u src/sys/arch/x68k/dev/intio_dmac.c:1.32 src/sys/arch/x68k/dev/intio_dmac.c:1.33
--- src/sys/arch/x68k/dev/intio_dmac.c:1.32 Sat Nov 29 06:16:49 2008
+++ src/sys/arch/x68k/dev/intio_dmac.c Sun Jun 6 04:50:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: intio_dmac.c,v 1.32 2008/11/29 06:16:49 isaki Exp $ */
+/* $NetBSD: intio_dmac.c,v 1.33 2010/06/06 04:50:08 mrg Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -33,10 +33,10 @@
* Hitachi HD63450 (= Motorola MC68450) DMAC driver for x68k.
*/
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intio_dmac.c,v 1.32 2008/11/29 06:16:49 isaki Exp $");
+#include "opt_m68k_arch.h"
-#include "opt_m680x0.h"
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: intio_dmac.c,v 1.33 2010/06/06 04:50:08 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/x68k/x68k/bus.c
diff -u src/sys/arch/x68k/x68k/bus.c:1.34 src/sys/arch/x68k/x68k/bus.c:1.35
--- src/sys/arch/x68k/x68k/bus.c:1.34 Fri Aug 21 04:12:27 2009
+++ src/sys/arch/x68k/x68k/bus.c Sun Jun 6 04:50:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.c,v 1.34 2009/08/21 04:12:27 thorpej Exp $ */
+/* $NetBSD: bus.c,v 1.35 2010/06/06 04:50:08 mrg Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,8 +34,10 @@
* These are default implementations; some buses may use their own.
*/
+#include "opt_m68k_arch.h"
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.34 2009/08/21 04:12:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.35 2010/06/06 04:50:08 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/x68k/x68k/locore.s
diff -u src/sys/arch/x68k/x68k/locore.s:1.97 src/sys/arch/x68k/x68k/locore.s:1.98
--- src/sys/arch/x68k/x68k/locore.s:1.97 Thu Feb 25 07:17:49 2010
+++ src/sys/arch/x68k/x68k/locore.s Sun Jun 6 04:50:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.97 2010/02/25 07:17:49 skrll Exp $ */
+/* $NetBSD: locore.s,v 1.98 2010/06/06 04:50:08 mrg Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -83,6 +83,7 @@
#include "opt_fpsp.h"
#include "opt_kgdb.h"
#include "opt_lockdebug.h"
+#include "opt_m68k_arch.h"
#include "ite.h"
#include "fd.h"
Index: src/sys/arch/x68k/x68k/machdep.c
diff -u src/sys/arch/x68k/x68k/machdep.c:1.165 src/sys/arch/x68k/x68k/machdep.c:1.166
--- src/sys/arch/x68k/x68k/machdep.c:1.165 Mon Feb 8 19:02:32 2010
+++ src/sys/arch/x68k/x68k/machdep.c Sun Jun 6 04:50:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.165 2010/02/08 19:02:32 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.166 2010/06/06 04:50:08 mrg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -77,17 +77,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.165 2010/02/08 19:02:32 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.166 2010/06/06 04:50:08 mrg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_compat_netbsd.h"
-#include "opt_m680x0.h"
#include "opt_fpu_emulate.h"
#include "opt_m060sp.h"
#include "opt_modular.h"
#include "opt_panicbutton.h"
#include "opt_extmem.h"
+#include "opt_m68k_arch.h"
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/x68k/x68k/pmap_bootstrap.c
diff -u src/sys/arch/x68k/x68k/pmap_bootstrap.c:1.50 src/sys/arch/x68k/x68k/pmap_bootstrap.c:1.51
--- src/sys/arch/x68k/x68k/pmap_bootstrap.c:1.50 Fri Dec 11 22:23:09 2009
+++ src/sys/arch/x68k/x68k/pmap_bootstrap.c Sun Jun 6 04:50:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.50 2009/12/11 22:23:09 tsutsui Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.51 2010/06/06 04:50:08 mrg Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -36,9 +36,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.50 2009/12/11 22:23:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.51 2010/06/06 04:50:08 mrg Exp $");
-#include "opt_m680x0.h"
+#include "opt_m68k_arch.h"
#include <sys/param.h>
#include <uvm/uvm_extern.h>
Index: src/sys/arch/x68k/x68k/trap.c
diff -u src/sys/arch/x68k/x68k/trap.c:1.99 src/sys/arch/x68k/x68k/trap.c:1.100
--- src/sys/arch/x68k/x68k/trap.c:1.99 Sat Mar 20 23:31:29 2010
+++ src/sys/arch/x68k/x68k/trap.c Sun Jun 6 04:50:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.99 2010/03/20 23:31:29 chs Exp $ */
+/* $NetBSD: trap.c,v 1.100 2010/06/06 04:50:08 mrg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -77,14 +77,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.99 2010/03/20 23:31:29 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.100 2010/06/06 04:50:08 mrg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_execfmt.h"
#include "opt_compat_sunos.h"
-#include "opt_m680x0.h"
#include "opt_fpu_emulate.h"
+#include "opt_m68k_arch.h"
#include <sys/param.h>
#include <sys/systm.h>
