Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch fix PR 6724 - convert m68k options to defflag's. t...
details: https://anonhg.NetBSD.org/src/rev/78fb4e777ebd
branches: trunk
changeset: 755435:78fb4e777ebd
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Jun 06 04:50:05 2010 +0000
description:
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
diffstat:
sys/arch/amiga/amiga/amiga_init.c | 5 +++--
sys/arch/amiga/amiga/locore.s | 4 ++--
sys/arch/amiga/amiga/machdep.c | 5 +++--
sys/arch/amiga/amiga/trap.c | 5 +++--
sys/arch/amiga/dev/bzivsc.c | 6 ++++--
sys/arch/amiga/dev/bzsc.c | 6 ++++--
sys/arch/amiga/dev/bztzsc.c | 6 ++++--
sys/arch/amiga/dev/cbiisc.c | 6 ++++--
sys/arch/amiga/dev/cbsc.c | 6 ++++--
sys/arch/amiga/dev/flsc.c | 5 +++--
sys/arch/amiga/dev/if_bah_zbus.c | 6 ++++--
sys/arch/amiga/dev/sbic.c | 5 +++--
sys/arch/atari/atari/atari_init.c | 5 +++--
sys/arch/atari/atari/bus.c | 6 ++++--
sys/arch/atari/atari/locore.s | 4 +++-
sys/arch/atari/atari/trap.c | 5 +++--
sys/arch/cesfic/cesfic/locore.s | 3 ++-
sys/arch/cesfic/cesfic/trap.c | 5 +++--
sys/arch/cesfic/include/cpu.h | 3 ++-
sys/arch/hp300/dev/dma.c | 6 ++++--
sys/arch/hp300/hp300/locore.s | 3 ++-
sys/arch/hp300/hp300/trap.c | 5 +++--
sys/arch/hp300/include/hp300spu.h | 3 ++-
sys/arch/luna68k/luna68k/locore.s | 3 ++-
sys/arch/luna68k/luna68k/machdep.c | 5 +++--
sys/arch/luna68k/luna68k/pmap_bootstrap.c | 6 ++++--
sys/arch/luna68k/luna68k/trap.c | 5 +++--
sys/arch/m68k/fpe/fpu_calcea.c | 6 ++++--
sys/arch/m68k/include/cacheops.h | 4 +++-
sys/arch/m68k/include/pmap_motorola.h | 4 +++-
sys/arch/m68k/m68k/bus_dma.c | 6 ++++--
sys/arch/m68k/m68k/cacheops.c | 6 ++++--
sys/arch/m68k/m68k/copypage.s | 4 +++-
sys/arch/m68k/m68k/pmap_motorola.c | 6 ++++--
sys/arch/m68k/m68k/sig_machdep.c | 6 ++++--
sys/arch/m68k/m68k/switch_subr.s | 3 ++-
sys/arch/m68k/m68k/sys_machdep.c | 4 +++-
sys/arch/mac68k/mac68k/locore.s | 7 +++++--
sys/arch/mac68k/mac68k/pmap_bootstrap.c | 6 ++++--
sys/arch/mac68k/mac68k/trap.c | 5 +++--
sys/arch/mvme68k/include/cpu.h | 3 ++-
sys/arch/mvme68k/mvme68k/locore.s | 3 ++-
sys/arch/mvme68k/mvme68k/machdep.c | 5 +++--
sys/arch/mvme68k/mvme68k/pmap_bootstrap.c | 6 ++++--
sys/arch/mvme68k/mvme68k/trap.c | 5 +++--
sys/arch/news68k/include/cpu.h | 3 ++-
sys/arch/news68k/news68k/locore.s | 3 ++-
sys/arch/news68k/news68k/pmap_bootstrap.c | 6 ++++--
sys/arch/news68k/news68k/trap.c | 5 +++--
sys/arch/next68k/include/cpu.h | 3 ++-
sys/arch/next68k/next68k/locore.s | 3 ++-
sys/arch/next68k/next68k/pmap_bootstrap.c | 6 ++++--
sys/arch/next68k/next68k/trap.c | 5 +++--
sys/arch/x68k/dev/intio_dmac.c | 8 ++++----
sys/arch/x68k/x68k/bus.c | 6 ++++--
sys/arch/x68k/x68k/locore.s | 3 ++-
sys/arch/x68k/x68k/machdep.c | 6 +++---
sys/arch/x68k/x68k/pmap_bootstrap.c | 6 +++---
sys/arch/x68k/x68k/trap.c | 6 +++---
59 files changed, 185 insertions(+), 105 deletions(-)
diffs (truncated from 1225 to 300 lines):
diff -r e7f325f063f5 -r 78fb4e777ebd sys/arch/amiga/amiga/amiga_init.c
--- a/sys/arch/amiga/amiga/amiga_init.c Sun Jun 06 03:34:14 2010 +0000
+++ b/sys/arch/amiga/amiga/amiga_init.c Sun Jun 06 04:50:05 2010 +0000
@@ -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>
diff -r e7f325f063f5 -r 78fb4e777ebd sys/arch/amiga/amiga/locore.s
--- a/sys/arch/amiga/amiga/locore.s Sun Jun 06 03:34:14 2010 +0000
+++ b/sys/arch/amiga/amiga/locore.s Sun Jun 06 04:50:05 2010 +0000
@@ -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>
diff -r e7f325f063f5 -r 78fb4e777ebd sys/arch/amiga/amiga/machdep.c
--- a/sys/arch/amiga/amiga/machdep.c Sun Jun 06 03:34:14 2010 +0000
+++ b/sys/arch/amiga/amiga/machdep.c Sun Jun 06 04:50:05 2010 +0000
@@ -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>
diff -r e7f325f063f5 -r 78fb4e777ebd sys/arch/amiga/amiga/trap.c
--- a/sys/arch/amiga/amiga/trap.c Sun Jun 06 03:34:14 2010 +0000
+++ b/sys/arch/amiga/amiga/trap.c Sun Jun 06 04:50:05 2010 +0000
@@ -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>
diff -r e7f325f063f5 -r 78fb4e777ebd sys/arch/amiga/dev/bzivsc.c
--- a/sys/arch/amiga/dev/bzivsc.c Sun Jun 06 03:34:14 2010 +0000
+++ b/sys/arch/amiga/dev/bzivsc.c Sun Jun 06 04:50:05 2010 +0000
@@ -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>
diff -r e7f325f063f5 -r 78fb4e777ebd sys/arch/amiga/dev/bzsc.c
--- a/sys/arch/amiga/dev/bzsc.c Sun Jun 06 03:34:14 2010 +0000
+++ b/sys/arch/amiga/dev/bzsc.c Sun Jun 06 04:50:05 2010 +0000
@@ -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
diff -r e7f325f063f5 -r 78fb4e777ebd sys/arch/amiga/dev/bztzsc.c
--- a/sys/arch/amiga/dev/bztzsc.c Sun Jun 06 03:34:14 2010 +0000
+++ b/sys/arch/amiga/dev/bztzsc.c Sun Jun 06 04:50:05 2010 +0000
@@ -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 (mhitch%montana.edu@localhost).
*/
+#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>
diff -r e7f325f063f5 -r 78fb4e777ebd sys/arch/amiga/dev/cbiisc.c
--- a/sys/arch/amiga/dev/cbiisc.c Sun Jun 06 03:34:14 2010 +0000
+++ b/sys/arch/amiga/dev/cbiisc.c Sun Jun 06 04:50:05 2010 +0000
@@ -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>
diff -r e7f325f063f5 -r 78fb4e777ebd sys/arch/amiga/dev/cbsc.c
--- a/sys/arch/amiga/dev/cbsc.c Sun Jun 06 03:34:14 2010 +0000
+++ b/sys/arch/amiga/dev/cbsc.c Sun Jun 06 04:50:05 2010 +0000
@@ -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>
diff -r e7f325f063f5 -r 78fb4e777ebd sys/arch/amiga/dev/flsc.c
--- a/sys/arch/amiga/dev/flsc.c Sun Jun 06 03:34:14 2010 +0000
+++ b/sys/arch/amiga/dev/flsc.c Sun Jun 06 04:50:05 2010 +0000
@@ -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>
diff -r e7f325f063f5 -r 78fb4e777ebd sys/arch/amiga/dev/if_bah_zbus.c
--- a/sys/arch/amiga/dev/if_bah_zbus.c Sun Jun 06 03:34:14 2010 +0000
+++ b/sys/arch/amiga/dev/if_bah_zbus.c Sun Jun 06 04:50:05 2010 +0000
@@ -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
diff -r e7f325f063f5 -r 78fb4e777ebd sys/arch/amiga/dev/sbic.c
--- a/sys/arch/amiga/dev/sbic.c Sun Jun 06 03:34:14 2010 +0000
+++ b/sys/arch/amiga/dev/sbic.c Sun Jun 06 04:50:05 2010 +0000
@@ -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>
diff -r e7f325f063f5 -r 78fb4e777ebd sys/arch/atari/atari/atari_init.c
--- a/sys/arch/atari/atari/atari_init.c Sun Jun 06 03:34:14 2010 +0000
+++ b/sys/arch/atari/atari/atari_init.c Sun Jun 06 04:50:05 2010 +0000
@@ -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>
diff -r e7f325f063f5 -r 78fb4e777ebd sys/arch/atari/atari/bus.c
--- a/sys/arch/atari/atari/bus.c Sun Jun 06 03:34:14 2010 +0000
+++ b/sys/arch/atari/atari/bus.c Sun Jun 06 04:50:05 2010 +0000
@@ -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>
diff -r e7f325f063f5 -r 78fb4e777ebd sys/arch/atari/atari/locore.s
--- a/sys/arch/atari/atari/locore.s Sun Jun 06 03:34:14 2010 +0000
+++ b/sys/arch/atari/atari/locore.s Sun Jun 06 04:50:05 2010 +0000
@@ -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 $ */
Home |
Main Index |
Thread Index |
Old Index