Module Name: src
Committed By: tsutsui
Date: Sat Oct 16 17:10:44 UTC 2010
Modified Files:
src/sys/arch/amiga/amiga: machdep.c
src/sys/arch/atari/atari: machdep.c
src/sys/arch/cesfic/cesfic: machdep.c
src/sys/arch/luna68k/luna68k: machdep.c
src/sys/arch/mac68k/mac68k: machdep.c
src/sys/arch/mvme68k/mvme68k: machdep.c
src/sys/arch/next68k/next68k: machdep.c
src/sys/arch/x68k/x68k: machdep.c
Log Message:
Prepare empty module_init_md() for options MODULAR for all other m68k ports.
To generate a diff of this commit:
cvs rdiff -u -r1.226 -r1.227 src/sys/arch/amiga/amiga/machdep.c
cvs rdiff -u -r1.167 -r1.168 src/sys/arch/atari/atari/machdep.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/cesfic/cesfic/machdep.c
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/luna68k/luna68k/machdep.c
cvs rdiff -u -r1.335 -r1.336 src/sys/arch/mac68k/mac68k/machdep.c
cvs rdiff -u -r1.143 -r1.144 src/sys/arch/mvme68k/mvme68k/machdep.c
cvs rdiff -u -r1.98 -r1.99 src/sys/arch/next68k/next68k/machdep.c
cvs rdiff -u -r1.166 -r1.167 src/sys/arch/x68k/x68k/machdep.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/machdep.c
diff -u src/sys/arch/amiga/amiga/machdep.c:1.226 src/sys/arch/amiga/amiga/machdep.c:1.227
--- src/sys/arch/amiga/amiga/machdep.c:1.226 Sun Jun 6 04:50:05 2010
+++ src/sys/arch/amiga/amiga/machdep.c Sat Oct 16 17:10:42 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.226 2010/06/06 04:50:05 mrg Exp $ */
+/* $NetBSD: machdep.c,v 1.227 2010/10/16 17:10:42 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -87,7 +87,7 @@
#include "opt_m68k_arch.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.226 2010/06/06 04:50:05 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.227 2010/10/16 17:10:42 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -109,6 +109,7 @@
#include <sys/core.h>
#include <sys/kcore.h>
#include <sys/ksyms.h>
+#include <sys/module.h>
#include <sys/cpu.h>
#include <sys/exec.h>
@@ -1263,6 +1264,13 @@
}
#ifdef MODULAR
+/*
+ * Push any modules loaded by the bootloader etc.
+ */
+void
+module_init_md(void)
+{
+}
int _spllkm6(void);
int _spllkm7(void);
Index: src/sys/arch/atari/atari/machdep.c
diff -u src/sys/arch/atari/atari/machdep.c:1.167 src/sys/arch/atari/atari/machdep.c:1.168
--- src/sys/arch/atari/atari/machdep.c:1.167 Tue Apr 13 11:22:22 2010
+++ src/sys/arch/atari/atari/machdep.c Sat Oct 16 17:10:42 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.167 2010/04/13 11:22:22 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.168 2010/10/16 17:10:42 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.167 2010/04/13 11:22:22 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.168 2010/10/16 17:10:42 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -103,6 +103,7 @@
#include <sys/mount.h>
#include <sys/syscallargs.h>
#include <sys/ksyms.h>
+#include <sys/module.h>
#include <sys/intr.h>
#include <sys/exec.h>
#include <sys/exec_aout.h>
@@ -877,6 +878,16 @@
return error;
}
+#ifdef MODULAR
+/*
+ * Push any modules loaded by the bootloader etc.
+ */
+void
+module_init_md(void)
+{
+}
+#endif
+
#ifdef _MILANHW_
/*
Index: src/sys/arch/cesfic/cesfic/machdep.c
diff -u src/sys/arch/cesfic/cesfic/machdep.c:1.54 src/sys/arch/cesfic/cesfic/machdep.c:1.55
--- src/sys/arch/cesfic/cesfic/machdep.c:1.54 Mon Feb 8 19:02:27 2010
+++ src/sys/arch/cesfic/cesfic/machdep.c Sat Oct 16 17:10:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.54 2010/02/08 19:02:27 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.55 2010/10/16 17:10:43 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.54 2010/02/08 19:02:27 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.55 2010/10/16 17:10:43 tsutsui Exp $");
#include "opt_bufcache.h"
#include "opt_ddb.h"
@@ -85,6 +85,7 @@
#include "opt_compat_netbsd.h"
#include "opt_sysv.h"
#include "opt_panicbutton.h"
+#include "opt_modular.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -107,6 +108,7 @@
#include <sys/tty.h>
#include <sys/vnode.h>
#include <sys/ksyms.h>
+#include <sys/module.h>
#ifdef SYSVMSG
#include <sys/msg.h>
#endif
@@ -701,3 +703,13 @@
return ENOEXEC;
}
+
+#ifdef MODULAR
+/*
+ * Push any modules loaded by the bootloader etc.
+ */
+void
+module_init_md(void)
+{
+}
+#endif
Index: src/sys/arch/luna68k/luna68k/machdep.c
diff -u src/sys/arch/luna68k/luna68k/machdep.c:1.75 src/sys/arch/luna68k/luna68k/machdep.c:1.76
--- src/sys/arch/luna68k/luna68k/machdep.c:1.75 Sun Jun 6 04:50:06 2010
+++ src/sys/arch/luna68k/luna68k/machdep.c Sat Oct 16 17:10:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.75 2010/06/06 04:50:06 mrg Exp $ */
+/* $NetBSD: machdep.c,v 1.76 2010/10/16 17:10:43 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.75 2010/06/06 04:50:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.76 2010/10/16 17:10:43 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -62,6 +62,7 @@
#include <sys/vnode.h>
#include <sys/syscallargs.h>
#include <sys/ksyms.h>
+#include <sys/module.h>
#ifdef KGDB
#include <sys/kgdb.h>
#endif
@@ -776,6 +777,16 @@
return error;
}
+#ifdef MODULAR
+/*
+ * Push any modules loaded by the bootloader etc.
+ */
+void
+module_init_md(void)
+{
+}
+#endif
+
#if 1
struct consdev *cn_tab = &syscons;
Index: src/sys/arch/mac68k/mac68k/machdep.c
diff -u src/sys/arch/mac68k/mac68k/machdep.c:1.335 src/sys/arch/mac68k/mac68k/machdep.c:1.336
--- src/sys/arch/mac68k/mac68k/machdep.c:1.335 Mon Feb 8 19:02:30 2010
+++ src/sys/arch/mac68k/mac68k/machdep.c Sat Oct 16 17:10:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.335 2010/02/08 19:02:30 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.336 2010/10/16 17:10:43 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -107,7 +107,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.335 2010/02/08 19:02:30 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.336 2010/10/16 17:10:43 tsutsui Exp $");
#include "opt_adb.h"
#include "opt_ddb.h"
@@ -142,6 +142,7 @@
#include <sys/syscallargs.h>
#include <sys/vnode.h>
#include <sys/ksyms.h>
+#include <sys/module.h>
#ifdef KGDB
#include <sys/kgdb.h>
#endif
@@ -925,6 +926,16 @@
return error;
}
+#ifdef MODULAR
+/*
+ * Push any modules loaded by the bootloader etc.
+ */
+void
+module_init_md(void)
+{
+}
+#endif
+
static char *envbuf = NULL;
/*
Index: src/sys/arch/mvme68k/mvme68k/machdep.c
diff -u src/sys/arch/mvme68k/mvme68k/machdep.c:1.143 src/sys/arch/mvme68k/mvme68k/machdep.c:1.144
--- src/sys/arch/mvme68k/mvme68k/machdep.c:1.143 Sun Jun 6 04:50:07 2010
+++ src/sys/arch/mvme68k/mvme68k/machdep.c Sat Oct 16 17:10:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.143 2010/06/06 04:50:07 mrg Exp $ */
+/* $NetBSD: machdep.c,v 1.144 2010/10/16 17:10:43 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.143 2010/06/06 04:50:07 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.144 2010/10/16 17:10:43 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_m060sp.h"
@@ -107,6 +107,7 @@
#include <sys/vnode.h>
#include <sys/syscallargs.h>
#include <sys/ksyms.h>
+#include <sys/module.h>
#include <sys/device.h>
#include "ksyms.h"
@@ -1171,6 +1172,16 @@
return ENOEXEC;
}
+#ifdef MODULAR
+/*
+ * Push any modules loaded by the bootloader etc.
+ */
+void
+module_init_md(void)
+{
+}
+#endif
+
const uint16_t ipl2psl_table[NIPL] = {
[IPL_NONE] = PSL_S | PSL_IPL0,
[IPL_SOFTCLOCK] = PSL_S | PSL_IPL1,
Index: src/sys/arch/next68k/next68k/machdep.c
diff -u src/sys/arch/next68k/next68k/machdep.c:1.98 src/sys/arch/next68k/next68k/machdep.c:1.99
--- src/sys/arch/next68k/next68k/machdep.c:1.98 Mon Feb 8 19:02:30 2010
+++ src/sys/arch/next68k/next68k/machdep.c Sat Oct 16 17:10:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.98 2010/02/08 19:02:30 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.99 2010/10/16 17:10:44 tsutsui Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.98 2010/02/08 19:02:30 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.99 2010/10/16 17:10:44 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -108,6 +108,7 @@
#include <sys/vnode.h>
#include <sys/syscallargs.h>
#include <sys/ksyms.h>
+#include <sys/module.h>
#ifdef KGDB
#include <sys/kgdb.h>
#endif
@@ -936,3 +937,13 @@
{
return ENOEXEC;
}
+
+#ifdef MODULAR
+/*
+ * Push any modules loaded by the bootloader etc.
+ */
+void
+module_init_md(void)
+{
+}
+#endif
Index: src/sys/arch/x68k/x68k/machdep.c
diff -u src/sys/arch/x68k/x68k/machdep.c:1.166 src/sys/arch/x68k/x68k/machdep.c:1.167
--- src/sys/arch/x68k/x68k/machdep.c:1.166 Sun Jun 6 04:50:08 2010
+++ src/sys/arch/x68k/x68k/machdep.c Sat Oct 16 17:10:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.166 2010/06/06 04:50:08 mrg Exp $ */
+/* $NetBSD: machdep.c,v 1.167 2010/10/16 17:10:44 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.166 2010/06/06 04:50:08 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.167 2010/10/16 17:10:44 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -112,6 +112,7 @@
#include <sys/core.h>
#include <sys/kcore.h>
#include <sys/ksyms.h>
+#include <sys/module.h>
#include <sys/cpu.h>
#include <sys/sysctl.h>
#include <sys/device.h>
@@ -1013,6 +1014,16 @@
#endif
}
+#ifdef MODULAR
+/*
+ * Push any modules loaded by the bootloader etc.
+ */
+void
+module_init_md(void)
+{
+}
+#endif
+
#ifdef EXTENDED_MEMORY
#ifdef EM_DEBUG
static int em_debug = 0;
