Module Name: src
Committed By: hannken
Date: Sun Nov 28 08:23:25 UTC 2010
Modified Files:
src/sys/arch/acorn32/mainbus: fd.c
src/sys/arch/arm/arm32: arm32_machdep.c
src/sys/arch/evbarm/beagle: beagle_machdep.c
src/sys/arch/evbarm/g42xxeb: g42xxeb_machdep.c
src/sys/arch/evbarm/gemini: gemini_machdep.c
src/sys/arch/evbarm/gumstix: gumstix_machdep.c
src/sys/arch/evbarm/imx31: imx31lk_machdep.c
src/sys/arch/evbarm/lubbock: lubbock_machdep.c
src/sys/arch/evbarm/netwalker: netwalker_machdep.c
src/sys/arch/evbarm/osk5912: osk5912_machdep.c
src/sys/arch/evbarm/tisdp24xx: sdp24xx_machdep.c
src/sys/arch/evbarm/viper: viper_machdep.c
src/sys/arch/zaurus/zaurus: machdep.c
Log Message:
As md(4) no longer has "needs-count" there is no "md.h" anymore.
Remove the inclusion of this file.
Acorn32 now always builds load_memory_disc_from_floppy(). This should
not be a problem as all configs have md(4).
Observed by: Masao Uebayashi <[email protected]>
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/acorn32/mainbus/fd.c
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/arm/arm32/arm32_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/beagle/beagle_machdep.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/gemini/gemini_machdep.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/gumstix/gumstix_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/imx31/imx31lk_machdep.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/lubbock/lubbock_machdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/netwalker/netwalker_machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/osk5912/osk5912_machdep.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/viper/viper_machdep.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/zaurus/zaurus/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/acorn32/mainbus/fd.c
diff -u src/sys/arch/acorn32/mainbus/fd.c:1.47 src/sys/arch/acorn32/mainbus/fd.c:1.48
--- src/sys/arch/acorn32/mainbus/fd.c:1.47 Wed Feb 24 23:03:00 2010
+++ src/sys/arch/acorn32/mainbus/fd.c Sun Nov 28 08:23:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.47 2010/02/24 23:03:00 dyoung Exp $ */
+/* $NetBSD: fd.c,v 1.48 2010/11/28 08:23:22 hannken Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.47 2010/02/24 23:03:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.48 2010/11/28 08:23:22 hannken Exp $");
#include "opt_ddb.h"
@@ -1479,9 +1479,6 @@
return rv;
}
-#include "md.h"
-#if NMD > 0
-
#include <dev/md.h>
int load_memory_disc_from_floppy(struct md_conf *md, dev_t dev);
@@ -1559,5 +1556,3 @@
splx(s);
return(0);
}
-
-#endif
Index: src/sys/arch/arm/arm32/arm32_machdep.c
diff -u src/sys/arch/arm/arm32/arm32_machdep.c:1.73 src/sys/arch/arm/arm32/arm32_machdep.c:1.74
--- src/sys/arch/arm/arm32/arm32_machdep.c:1.73 Mon Feb 8 19:02:26 2010
+++ src/sys/arch/arm/arm32/arm32_machdep.c Sun Nov 28 08:23:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_machdep.c,v 1.73 2010/02/08 19:02:26 joerg Exp $ */
+/* $NetBSD: arm32_machdep.c,v 1.74 2010/11/28 08:23:22 hannken Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.73 2010/02/08 19:02:26 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.74 2010/11/28 08:23:22 hannken Exp $");
#include "opt_modular.h"
#include "opt_md.h"
@@ -69,13 +69,11 @@
#include <arm/arm32/machdep.h>
#include <machine/bootconfig.h>
-#include "md.h"
-
struct vm_map *phys_map = NULL;
-#if NMD > 0 && defined(MEMORY_DISK_HOOKS) && !defined(MEMORY_DISK_ROOT_SIZE)
+#if defined(MEMORY_DISK_HOOKS) && !defined(MEMORY_DISK_ROOT_SIZE)
extern size_t md_root_size; /* Memory disc size */
-#endif /* NMD && MEMORY_DISK_HOOKS && !MEMORY_DISK_ROOT_SIZE */
+#endif /* MEMORY_DISK_HOOKS && !MEMORY_DISK_ROOT_SIZE */
pv_addr_t kernelstack;
@@ -369,7 +367,7 @@
/* if (get_bootconf_option(args, "nbuf", BOOTOPT_TYPE_INT, &integer))
bufpages = integer;*/
-#if NMD > 0 && defined(MEMORY_DISK_HOOKS) && !defined(MEMORY_DISK_ROOT_SIZE)
+#if defined(MEMORY_DISK_HOOKS) && !defined(MEMORY_DISK_ROOT_SIZE)
if (get_bootconf_option(args, "memorydisc", BOOTOPT_TYPE_INT, &integer)
|| get_bootconf_option(args, "memorydisk", BOOTOPT_TYPE_INT, &integer)) {
md_root_size = integer;
@@ -379,7 +377,7 @@
if (md_root_size > 2048*1024)
md_root_size = 2048*1024;
}
-#endif /* NMD && MEMORY_DISK_HOOKS && !MEMORY_DISK_ROOT_SIZE */
+#endif /* MEMORY_DISK_HOOKS && !MEMORY_DISK_ROOT_SIZE */
if (get_bootconf_option(args, "quiet", BOOTOPT_TYPE_BOOLEAN, &integer)
|| get_bootconf_option(args, "-q", BOOTOPT_TYPE_BOOLEAN, &integer))
Index: src/sys/arch/evbarm/beagle/beagle_machdep.c
diff -u src/sys/arch/evbarm/beagle/beagle_machdep.c:1.10 src/sys/arch/evbarm/beagle/beagle_machdep.c:1.11
--- src/sys/arch/evbarm/beagle/beagle_machdep.c:1.10 Sat Aug 28 13:42:12 2010
+++ src/sys/arch/evbarm/beagle/beagle_machdep.c Sun Nov 28 08:23:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: beagle_machdep.c,v 1.10 2010/08/28 13:42:12 ahoka Exp $ */
+/* $NetBSD: beagle_machdep.c,v 1.11 2010/11/28 08:23:22 hannken Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.10 2010/08/28 13:42:12 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.11 2010/11/28 08:23:22 hannken Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -135,7 +135,6 @@
#include "opt_com.h"
#include "opt_omap.h"
#include "prcm.h"
-#include "md.h"
#include <sys/param.h>
#include <sys/device.h>
Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.21 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.22
--- src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.21 Mon Dec 28 03:22:20 2009
+++ src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c Sun Nov 28 08:23:23 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: g42xxeb_machdep.c,v 1.21 2009/12/28 03:22:20 uebayasi Exp $ */
+/* $NetBSD: g42xxeb_machdep.c,v 1.22 2010/11/28 08:23:23 hannken Exp $ */
/*
* Copyright (c) 2002, 2003, 2004, 2005 Genetec Corporation.
@@ -112,7 +112,6 @@
#include "opt_pmap_debug.h"
#include "opt_md.h"
#include "opt_com.h"
-#include "md.h"
#include "lcd.h"
#include <sys/param.h>
Index: src/sys/arch/evbarm/gemini/gemini_machdep.c
diff -u src/sys/arch/evbarm/gemini/gemini_machdep.c:1.15 src/sys/arch/evbarm/gemini/gemini_machdep.c:1.16
--- src/sys/arch/evbarm/gemini/gemini_machdep.c:1.15 Sat Dec 26 16:01:24 2009
+++ src/sys/arch/evbarm/gemini/gemini_machdep.c Sun Nov 28 08:23:23 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_machdep.c,v 1.15 2009/12/26 16:01:24 uebayasi Exp $ */
+/* $NetBSD: gemini_machdep.c,v 1.16 2010/11/28 08:23:23 hannken Exp $ */
/* adapted from:
* NetBSD: sdp24xx_machdep.c,v 1.4 2008/08/27 11:03:10 matt Exp
@@ -129,7 +129,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.15 2009/12/26 16:01:24 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.16 2010/11/28 08:23:23 hannken Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -140,7 +140,6 @@
#include "opt_gemini.h"
#include "geminiwdt.h"
#include "geminiipm.h"
-#include "md.h"
#include <sys/param.h>
#include <sys/device.h>
Index: src/sys/arch/evbarm/gumstix/gumstix_machdep.c
diff -u src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.34 src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.35
--- src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.34 Thu Sep 23 07:01:41 2010
+++ src/sys/arch/evbarm/gumstix/gumstix_machdep.c Sun Nov 28 08:23:23 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: gumstix_machdep.c,v 1.34 2010/09/23 07:01:41 kiyohara Exp $ */
+/* $NetBSD: gumstix_machdep.c,v 1.35 2010/11/28 08:23:23 hannken Exp $ */
/*
* Copyright (C) 2005, 2006, 2007 WIDE Project and SOUM Corporation.
* All rights reserved.
@@ -150,7 +150,6 @@
#include "opt_md.h"
#include "opt_modular.h"
#include "opt_com.h"
-#include "md.h"
#include <sys/param.h>
#include <sys/conf.h>
Index: src/sys/arch/evbarm/imx31/imx31lk_machdep.c
diff -u src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.10 src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.11
--- src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.10 Sat Nov 13 06:29:12 2010
+++ src/sys/arch/evbarm/imx31/imx31lk_machdep.c Sun Nov 28 08:23:23 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: imx31lk_machdep.c,v 1.10 2010/11/13 06:29:12 bsh Exp $ */
+/* $NetBSD: imx31lk_machdep.c,v 1.11 2010/11/28 08:23:23 hannken Exp $ */
/*
* Startup routines for the ZOOM iMX31 LITEKIT.
@@ -110,7 +110,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.10 2010/11/13 06:29:12 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.11 2010/11/28 08:23:23 hannken Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -118,7 +118,6 @@
#include "opt_pmap_debug.h"
#include "opt_md.h"
#include "opt_com.h"
-#include "md.h"
#include <sys/param.h>
#include <sys/device.h>
Index: src/sys/arch/evbarm/lubbock/lubbock_machdep.c
diff -u src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.25 src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.26
--- src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.25 Mon Dec 28 03:22:20 2009
+++ src/sys/arch/evbarm/lubbock/lubbock_machdep.c Sun Nov 28 08:23:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: lubbock_machdep.c,v 1.25 2009/12/28 03:22:20 uebayasi Exp $ */
+/* $NetBSD: lubbock_machdep.c,v 1.26 2010/11/28 08:23:24 hannken Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -112,14 +112,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.25 2009/12/28 03:22:20 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.26 2010/11/28 08:23:24 hannken Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_pmap_debug.h"
#include "opt_md.h"
#include "opt_com.h"
-#include "md.h"
#include "lcd.h"
#include <sys/param.h>
Index: src/sys/arch/evbarm/netwalker/netwalker_machdep.c
diff -u src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.1 src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.2
--- src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.1 Sat Nov 13 07:31:32 2010
+++ src/sys/arch/evbarm/netwalker/netwalker_machdep.c Sun Nov 28 08:23:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: netwalker_machdep.c,v 1.1 2010/11/13 07:31:32 bsh Exp $ */
+/* $NetBSD: netwalker_machdep.c,v 1.2 2010/11/28 08:23:24 hannken Exp $ */
/*
* Copyright (c) 2002, 2003, 2005, 2010 Genetec Corporation.
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.1 2010/11/13 07:31:32 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.2 2010/11/28 08:23:24 hannken Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -110,7 +110,6 @@
#include "opt_pmap_debug.h"
#include "opt_md.h"
#include "opt_com.h"
-#include "md.h"
#include "imxuart.h"
#include "opt_imxuart.h"
#include "opt_imx.h"
Index: src/sys/arch/evbarm/osk5912/osk5912_machdep.c
diff -u src/sys/arch/evbarm/osk5912/osk5912_machdep.c:1.8 src/sys/arch/evbarm/osk5912/osk5912_machdep.c:1.9
--- src/sys/arch/evbarm/osk5912/osk5912_machdep.c:1.8 Sat Dec 26 16:01:25 2009
+++ src/sys/arch/evbarm/osk5912/osk5912_machdep.c Sun Nov 28 08:23:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: osk5912_machdep.c,v 1.8 2009/12/26 16:01:25 uebayasi Exp $ */
+/* $NetBSD: osk5912_machdep.c,v 1.9 2010/11/28 08:23:24 hannken Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -99,14 +99,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osk5912_machdep.c,v 1.8 2009/12/26 16:01:25 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osk5912_machdep.c,v 1.9 2010/11/28 08:23:24 hannken Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_md.h"
#include "opt_com.h"
-#include "md.h"
#include <sys/param.h>
#include <sys/device.h>
Index: src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
diff -u src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.9 src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.10
--- src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.9 Sat Dec 26 16:01:25 2009
+++ src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c Sun Nov 28 08:23:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sdp24xx_machdep.c,v 1.9 2009/12/26 16:01:25 uebayasi Exp $ */
+/* $NetBSD: sdp24xx_machdep.c,v 1.10 2010/11/28 08:23:24 hannken Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdp24xx_machdep.c,v 1.9 2009/12/26 16:01:25 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdp24xx_machdep.c,v 1.10 2010/11/28 08:23:24 hannken Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -134,7 +134,6 @@
#include "opt_md.h"
#include "opt_com.h"
#include "opt_omap.h"
-#include "md.h"
#include <sys/param.h>
#include <sys/device.h>
Index: src/sys/arch/evbarm/viper/viper_machdep.c
diff -u src/sys/arch/evbarm/viper/viper_machdep.c:1.16 src/sys/arch/evbarm/viper/viper_machdep.c:1.17
--- src/sys/arch/evbarm/viper/viper_machdep.c:1.16 Sat Dec 26 16:01:25 2009
+++ src/sys/arch/evbarm/viper/viper_machdep.c Sun Nov 28 08:23:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: viper_machdep.c,v 1.16 2009/12/26 16:01:25 uebayasi Exp $ */
+/* $NetBSD: viper_machdep.c,v 1.17 2010/11/28 08:23:24 hannken Exp $ */
/*
* Startup routines for the Arcom Viper. Below you can trace the
@@ -112,14 +112,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.16 2009/12/26 16:01:25 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.17 2010/11/28 08:23:24 hannken Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_pmap_debug.h"
#include "opt_md.h"
#include "opt_com.h"
-#include "md.h"
#include "lcd.h"
#include <sys/param.h>
Index: src/sys/arch/zaurus/zaurus/machdep.c
diff -u src/sys/arch/zaurus/zaurus/machdep.c:1.20 src/sys/arch/zaurus/zaurus/machdep.c:1.21
--- src/sys/arch/zaurus/zaurus/machdep.c:1.20 Mon Dec 28 03:22:20 2009
+++ src/sys/arch/zaurus/zaurus/machdep.c Sun Nov 28 08:23:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.20 2009/12/28 03:22:20 uebayasi Exp $ */
+/* $NetBSD: machdep.c,v 1.21 2010/11/28 08:23:25 hannken Exp $ */
/* $OpenBSD: zaurus_machdep.c,v 1.25 2006/06/20 18:24:04 todd Exp $ */
/*
@@ -107,7 +107,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.20 2009/12/28 03:22:20 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.21 2010/11/28 08:23:25 hannken Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -115,7 +115,6 @@
#include "opt_pmap_debug.h"
#include "opt_md.h"
#include "opt_com.h"
-#include "md.h"
#include "ksyms.h"
#include "opt_kloader.h"
