From d213d804f73c7b547c87efda873ac6fe000b2326 Mon Sep 17 00:00:00 2001
From: lukem <lukem@NetBSD.org>
Date: Tue, 2 Apr 2002 05:30:34 +0000
Subject: [PATCH] Rename MEMORY_DISK_SIZE (formerly MINIROOTSIZE) to
 MEMORY_DISK_ROOT_SIZE, which was suggested by Izumi Tsutsui
 <tsutsui@ceres.dti.ne.jp> as being more consistent with what it's
 controlling...

---
 share/man/man4/options.4             |  4 ++--
 sys/arch/acorn26/conf/FOURMEG        |  4 ++--
 sys/arch/acorn26/conf/GENERIC        |  4 ++--
 sys/arch/acorn32/conf/GENERIC        |  6 +++---
 sys/arch/acorn32/conf/INSTALL        |  6 +++---
 sys/arch/acorn32/conf/LOWMEM_WSCONS  |  4 ++--
 sys/arch/acorn32/conf/NC             |  4 ++--
 sys/arch/acorn32/conf/NC_WSCONS      |  4 ++--
 sys/arch/acorn32/conf/RPC_WSCONS     |  6 +++---
 sys/arch/acorn32/dev/md_hooks.c      | 18 +++++++++---------
 sys/arch/alpha/conf/INSTALL          |  4 ++--
 sys/arch/alpha/conf/RAMDISK          |  4 ++--
 sys/arch/amiga/conf/MDINSTALL        |  4 ++--
 sys/arch/amiga/conf/RAMDISK          |  4 ++--
 sys/arch/arc/conf/RAMDISK            |  4 ++--
 sys/arch/arm/arm32/arm32_machdep.c   | 10 +++++-----
 sys/arch/bebox/conf/INSTALL          |  4 ++--
 sys/arch/cats/conf/GENERIC           |  4 ++--
 sys/arch/cats/conf/INSTALL           |  4 ++--
 sys/arch/dreamcast/conf/GENERIC      |  6 +++---
 sys/arch/evbarm/conf/INTEGRATOR      |  4 ++--
 sys/arch/evbarm/conf/IQ80310         |  4 ++--
 sys/arch/evbarm/conf/IQ80321         |  5 ++---
 sys/arch/evbarm/conf/TEAMASA_NPWR    |  4 ++--
 sys/arch/evbmips/conf/MALTA          |  8 ++++----
 sys/arch/evbsh3/conf/COMPUTEX7750    |  4 ++--
 sys/arch/evbsh3/conf/COMPUTEXEVB     |  4 ++--
 sys/arch/evbsh3/conf/CQREEKSH3       |  4 ++--
 sys/arch/evbsh3/conf/KZSH401         |  4 ++--
 sys/arch/hp300/conf/RAMDISK          |  4 ++--
 sys/arch/hpcarm/conf/IPAQ            |  4 ++--
 sys/arch/hpcarm/conf/JORNADA720      |  6 +++---
 sys/arch/hpcmips/conf/INSTALL_TX3912 |  4 ++--
 sys/arch/hpcmips/conf/RAMDISK        |  4 ++--
 sys/arch/hpcmips/conf/TX3912         |  6 +++---
 sys/arch/i386/conf/INSTALL           |  6 +++---
 sys/arch/i386/conf/INSTALL_LAPTOP    |  6 +++---
 sys/arch/i386/conf/INSTALL_PS2       |  4 ++--
 sys/arch/i386/conf/INSTALL_SMALL     |  4 ++--
 sys/arch/i386/conf/INSTALL_TINY      |  4 ++--
 sys/arch/mac68k/conf/INSTALL         |  4 ++--
 sys/arch/mac68k/conf/INSTALLSBC      |  4 ++--
 sys/arch/mac68k/conf/RAMDISK         |  4 ++--
 sys/arch/macppc/conf/GENERIC_MD      |  4 ++--
 sys/arch/macppc/conf/INSTALL         |  4 ++--
 sys/arch/mipsco/conf/RAMDISK         |  4 ++--
 sys/arch/mmeye/conf/GENERIC          |  6 +++---
 sys/arch/mmeye/conf/MMEYE            |  4 ++--
 sys/arch/mmeye/conf/MMTA             |  4 ++--
 sys/arch/mmeye/conf/MMTAICE          |  4 ++--
 sys/arch/mmeye/conf/MMTANEW          |  4 ++--
 sys/arch/mmeye/conf/MMTAROMNEW       |  4 ++--
 sys/arch/mvme68k/conf/RAMDISK        |  4 ++--
 sys/arch/netwinder/conf/GENERIC      |  4 ++--
 sys/arch/news68k/conf/INSTALL        |  4 ++--
 sys/arch/newsmips/conf/INSTALL       |  4 ++--
 sys/arch/next68k/conf/RAMDISK        |  4 ++--
 sys/arch/pc532/conf/INSTALL          |  4 ++--
 sys/arch/playstation2/conf/RAMDISK   |  4 ++--
 sys/arch/pmax/conf/RAMDISK           |  6 +++---
 sys/arch/prep/conf/INSTALL           |  4 ++--
 sys/arch/sandpoint/conf/INSTALL      |  4 ++--
 sys/arch/sandpoint/conf/RAMDISK      |  4 ++--
 sys/arch/sgimips/conf/INDY           |  4 ++--
 sys/arch/shark/conf/GENERIC          |  6 +++---
 sys/arch/shark/conf/INSTALL          |  4 ++--
 sys/arch/shark/conf/OFWGENCFG        |  4 ++--
 sys/arch/sparc/conf/INSTALL          |  4 ++--
 sys/arch/sparc64/conf/INSTALL        |  6 +++---
 sys/arch/sun2/conf/RAMDISK           |  4 ++--
 sys/arch/sun3/conf/RAMDISK           |  4 ++--
 sys/arch/sun3/conf/RAMDISK3X         |  4 ++--
 sys/arch/vax/conf/INSTALL            |  4 ++--
 sys/arch/walnut/conf/WALNUT          |  5 ++---
 sys/arch/x68k/conf/INSTALL           | 10 +++++-----
 sys/arch/x86_64/conf/SIMICS          |  6 +++---
 sys/arch/x86_64/x86_64/md_root.c     |  8 ++++----
 sys/conf/files                       |  4 ++--
 sys/dev/md_root.c                    | 10 +++++-----
 79 files changed, 191 insertions(+), 193 deletions(-)

diff --git a/share/man/man4/options.4 b/share/man/man4/options.4
index dfc26be1e0eb..eab823cbfc65 100644
--- a/share/man/man4/options.4
+++ b/share/man/man4/options.4
@@ -1,4 +1,4 @@
-.\"	$NetBSD: options.4,v 1.166 2002/03/23 09:56:58 jdolecek Exp $
+.\"	$NetBSD: options.4,v 1.167 2002/04/02 05:30:34 lukem Exp $
 .\"
 .\" Copyright (c) 1996
 .\" 	Perry E. Metzger.  All rights reserved.
@@ -811,7 +811,7 @@ Forces the
 disk to be the root device.
 This can only be overridden when
 the kernel is booted in the 'ask-for-root' mode.
-.It Cd options MEMORY_DISK_SIZE=integer
+.It Cd options MEMORY_DISK_ROOT_SIZE=integer
 Allocates the given number of 512 byte blocks as memory for the
 .Xr md 4
 .Tn RAM
diff --git a/sys/arch/acorn26/conf/FOURMEG b/sys/arch/acorn26/conf/FOURMEG
index 19daa03993af..034c722fdffb 100644
--- a/sys/arch/acorn26/conf/FOURMEG
+++ b/sys/arch/acorn26/conf/FOURMEG
@@ -1,4 +1,4 @@
-# $NetBSD: FOURMEG,v 1.3 2002/03/29 19:15:17 bjh21 Exp $
+# $NetBSD: FOURMEG,v 1.4 2002/04/02 05:30:36 lukem Exp $
 
 # FOURMEG arm26 configuration -- something small
 
@@ -187,7 +187,7 @@ wsdisplay0	at arcvideo0
 pseudo-device	loop		1
 pseudo-device	md		1
 #options 	MEMORY_DISK_HOOKS
-#options 	MEMORY_DISK_SIZE=
+#options 	MEMORY_DISK_ROOT_SIZE=
 #pseudo-device	ppp		4
 pseudo-device	pty
 #pseudo-device	sl		4
diff --git a/sys/arch/acorn26/conf/GENERIC b/sys/arch/acorn26/conf/GENERIC
index cddc9c22e97d..4009f3458b1d 100644
--- a/sys/arch/acorn26/conf/GENERIC
+++ b/sys/arch/acorn26/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1 2002/03/24 15:46:50 bjh21 Exp $
+# $NetBSD: GENERIC,v 1.2 2002/04/02 05:30:36 lukem Exp $
 #
 # GENERIC machine description file
 # 
@@ -208,7 +208,7 @@ options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
 pseudo-device	loop		1
 pseudo-device	md		1
 #options 	MEMORY_DISK_HOOKS
-#options 	MEMORY_DISK_SIZE=
+#options 	MEMORY_DISK_ROOT_SIZE=
 pseudo-device	ppp		4
 pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
 pseudo-device	pty			# pseudo-terminals
diff --git a/sys/arch/acorn32/conf/GENERIC b/sys/arch/acorn32/conf/GENERIC
index d3a4cb609ab0..8021c423a06c 100644
--- a/sys/arch/acorn32/conf/GENERIC
+++ b/sys/arch/acorn32/conf/GENERIC
@@ -1,4 +1,4 @@
-# 	$NetBSD: GENERIC,v 1.12 2002/03/10 19:56:37 lukem Exp $
+# 	$NetBSD: GENERIC,v 1.13 2002/04/02 05:30:36 lukem Exp $
 #
 #	GENERIC --- NetBSD/acorn32 complete configuration
 #
@@ -20,7 +20,7 @@
 
 include		"arch/acorn32/conf/std.acorn32"
 
-#ident		"GENERIC-$Revision: 1.12 $"
+#ident		"GENERIC-$Revision: 1.13 $"
 
 # estimated number of users
 maxusers	32
@@ -119,7 +119,7 @@ options 	SHMMAXPGS=1024	# 1024 pages is the default
 # Device options
 
 options 	MEMORY_DISK_HOOKS	# boottime setup of ramdisk
-#options 	MEMORY_DISK_SIZE=4100	# Size in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=4100	# Size in blocks
 #options 	MEMORY_DISK_IS_ROOT	# use memory disk as root
 
 # Miscellaneous kernel options
diff --git a/sys/arch/acorn32/conf/INSTALL b/sys/arch/acorn32/conf/INSTALL
index c58fb3355af0..0ccc96e6408e 100644
--- a/sys/arch/acorn32/conf/INSTALL
+++ b/sys/arch/acorn32/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.6 2002/03/12 12:52:11 reinoud Exp $
+#	$NetBSD: INSTALL,v 1.7 2002/04/02 05:30:36 lukem Exp $
 #
 #	INSTALL -- NetBSD/acorn32 install configuration
 #
@@ -20,7 +20,7 @@
 
 include		"arch/acorn32/conf/std.acorn32"
 
-#ident		"INSTALL-$Revision: 1.6 $"
+#ident		"INSTALL-$Revision: 1.7 $"
 
 # estimated number of users
 maxusers	32
@@ -119,7 +119,7 @@ options 	COMPAT_12	# NetBSD 1.2 compatibility.
 # Device options
 
 options 	MEMORY_DISK_HOOKS	# boottime setup of ramdisk
-options 	MEMORY_DISK_SIZE=4100	# Size in blocks
+options 	MEMORY_DISK_ROOT_SIZE=4100	# Size in blocks
 options 	MEMORY_DISK_IS_ROOT	# use memory disk as root
 
 # Miscellaneous kernel options
diff --git a/sys/arch/acorn32/conf/LOWMEM_WSCONS b/sys/arch/acorn32/conf/LOWMEM_WSCONS
index 62296227d7bb..736b4cdf5b50 100644
--- a/sys/arch/acorn32/conf/LOWMEM_WSCONS
+++ b/sys/arch/acorn32/conf/LOWMEM_WSCONS
@@ -1,4 +1,4 @@
-#	$NetBSD: LOWMEM_WSCONS,v 1.8 2002/03/10 19:56:38 lukem Exp $
+#	$NetBSD: LOWMEM_WSCONS,v 1.9 2002/04/02 05:30:37 lukem Exp $
 #
 #	LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines
 #
@@ -99,7 +99,7 @@ options 	COMPAT_13	# NetBSD 1.3 compatibility.
 # Device options
 
 options 	MEMORY_DISK_HOOKS	# boottime setup of ramdisk
-#options 	MEMORY_DISK_SIZE=3400	# Size in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=3400	# Size in blocks
 #options 	MEMORY_DISK_IS_ROOT	# use memory disk as root
 
 # Miscellaneous kernel options
diff --git a/sys/arch/acorn32/conf/NC b/sys/arch/acorn32/conf/NC
index 6bc58cfe68a0..686fb1a7542f 100644
--- a/sys/arch/acorn32/conf/NC
+++ b/sys/arch/acorn32/conf/NC
@@ -1,4 +1,4 @@
-#	$NetBSD: NC,v 1.7 2002/03/10 19:56:38 lukem Exp $
+#	$NetBSD: NC,v 1.8 2002/04/02 05:30:37 lukem Exp $
 #
 #	NC - with vidcconsole
 #
@@ -94,7 +94,7 @@ options 	SHMMAXPGS=1024	# 1024 pages is the default
 # Device options
 
 options 	MEMORY_DISK_HOOKS	# boottime setup of ramdisk
-#options 	MEMORY_DISK_SIZE=3400	# Size in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=3400	# Size in blocks
 #options 	MEMORY_DISK_IS_ROOT	# use memory disk as root
 
 # Miscellaneous kernel options
diff --git a/sys/arch/acorn32/conf/NC_WSCONS b/sys/arch/acorn32/conf/NC_WSCONS
index c71c6a7c3057..603a092df2ca 100644
--- a/sys/arch/acorn32/conf/NC_WSCONS
+++ b/sys/arch/acorn32/conf/NC_WSCONS
@@ -1,4 +1,4 @@
-#	$NetBSD: NC_WSCONS,v 1.9 2002/03/10 19:56:38 lukem Exp $
+#	$NetBSD: NC_WSCONS,v 1.10 2002/04/02 05:30:37 lukem Exp $
 #
 #	NC - with wscons
 #
@@ -96,7 +96,7 @@ options 	SHMMAXPGS=1024	# 1024 pages is the default
 # Device options
 
 options 	MEMORY_DISK_HOOKS	# boottime setup of ramdisk
-#options 	MEMORY_DISK_SIZE=3400	# Size in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=3400	# Size in blocks
 #options 	MEMORY_DISK_IS_ROOT	# use memory disk as root
 
 # Miscellaneous kernel options
diff --git a/sys/arch/acorn32/conf/RPC_WSCONS b/sys/arch/acorn32/conf/RPC_WSCONS
index f55d3f585798..417bce2808cb 100644
--- a/sys/arch/acorn32/conf/RPC_WSCONS
+++ b/sys/arch/acorn32/conf/RPC_WSCONS
@@ -1,4 +1,4 @@
-#	$NetBSD: RPC_WSCONS,v 1.10 2002/03/10 19:56:38 lukem Exp $
+#	$NetBSD: RPC_WSCONS,v 1.11 2002/04/02 05:30:37 lukem Exp $
 #
 #	RPC_WSCONS -- Full RiscPC config with wscons
 #
@@ -20,7 +20,7 @@
 
 include		"arch/acorn32/conf/std.acorn32"
 
-#ident		"GENERIC-$Revision: 1.10 $"
+#ident		"GENERIC-$Revision: 1.11 $"
 
 # estimated number of users
 maxusers	32
@@ -119,7 +119,7 @@ options 	SHMMAXPGS=1024	# 1024 pages is the default
 # Device options
 
 options 	MEMORY_DISK_HOOKS	# boottime setup of ramdisk
-#options 	MEMORY_DISK_SIZE=3800	# Size in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=3800	# Size in blocks
 #options 	MEMORY_DISK_IS_ROOT	# use memory disk as root
 
 # Miscellaneous kernel options
diff --git a/sys/arch/acorn32/dev/md_hooks.c b/sys/arch/acorn32/dev/md_hooks.c
index 87318517e7bc..7e22ef744f04 100644
--- a/sys/arch/acorn32/dev/md_hooks.c
+++ b/sys/arch/acorn32/dev/md_hooks.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md_hooks.c,v 1.2 2002/03/10 19:53:25 lukem Exp $	*/
+/*	$NetBSD: md_hooks.c,v 1.3 2002/04/02 05:30:37 lukem Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -38,8 +38,8 @@
 
 #include <dev/md.h>
 
-#ifdef	MEMORY_DISK_SIZE
-#define ROOTBYTES (MEMORY_DISK_SIZE << DEV_BSHIFT)
+#ifdef	MEMORY_DISK_ROOT_SIZE
+#define ROOTBYTES (MEMORY_DISK_ROOT_SIZE << DEV_BSHIFT)
 
 /*
  * This array will be patched to contain a file-system image.
@@ -48,7 +48,7 @@
 int md_root_size = ROOTBYTES;
 char md_root_image[ROOTBYTES] = "|This is the root ramdisk!\n";
 
-#else	/* MEMORY_DISK_SIZE */
+#else	/* MEMORY_DISK_ROOT_SIZE */
 
 u_int memory_disc_size = 0;		/* set by machdep.c */
 static struct md_conf *bootmd = NULL;
@@ -56,7 +56,7 @@ static struct md_conf *bootmd = NULL;
 extern int load_memory_disc_from_floppy __P((struct md_conf *md, dev_t dev));
 
 #include "fdc.h"
-#endif	/* MEMORY_DISK_SIZE */
+#endif	/* MEMORY_DISK_ROOT_SIZE */
 
 void
 md_attach_hook(unit, md)
@@ -64,12 +64,12 @@ md_attach_hook(unit, md)
 	struct md_conf *md;
 {
 	if (unit == 0) {
-#ifdef MEMORY_DISK_SIZE
+#ifdef MEMORY_DISK_ROOT_SIZE
 		/* Setup root ramdisk */
 		md->md_addr = (caddr_t) md_root_image;
 		md->md_size = (size_t)  md_root_size;
 		md->md_type = MD_KMEM_FIXED;
-#else	/* MEMORY_DISK_SIZE */
+#else	/* MEMORY_DISK_ROOT_SIZE */
 #ifdef OLD_MEMORY_DISK_SIZE
 		if (memory_disc_size == 0 && OLD_MEMORY_DISK_SIZE)
 			memory_disc_size = (OLD_MEMORY_DISK_SIZE << DEV_BSHIFT);
@@ -80,7 +80,7 @@ md_attach_hook(unit, md)
 			md->md_type = MD_KMEM_FIXED;
 			bootmd = md;
 		}
-#endif	/* MEMORY_DISK_SIZE */
+#endif	/* MEMORY_DISK_ROOT_SIZE */
 		printf("md%d: allocated %ldK (%ld blocks)\n", unit, (long)md->md_size / 1024, (long)md->md_size / DEV_BSIZE);
 	}
 }
@@ -98,7 +98,7 @@ md_open_hook(unit, md)
 	if (unit == 0) {
 		/* The root memory disk only works single-user. */
 		boothowto |= RB_SINGLE;
-#if !defined(MEMORY_DISK_SIZE) && NFDC > 0
+#if !defined(MEMORY_DISK_ROOT_SIZE) && NFDC > 0
 		load_memory_disc_from_floppy(bootmd, makedev(17, 1));	/* XXX 1.44MB FD */
 #endif
 	}
diff --git a/sys/arch/alpha/conf/INSTALL b/sys/arch/alpha/conf/INSTALL
index 971c3190371f..60ffe50fe25f 100644
--- a/sys/arch/alpha/conf/INSTALL
+++ b/sys/arch/alpha/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.60 2002/03/10 19:56:38 lukem Exp $
+# $NetBSD: INSTALL,v 1.61 2002/04/02 05:30:37 lukem Exp $
 #
 # Alpha INSTALL kernel.
 
@@ -14,7 +14,7 @@ options 	DDB
 # Enable the hooks used for initializing the ram-disk.
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# Force root on ram-disk
-options 	MEMORY_DISK_SIZE=9300	# 4 Megabytes
+options 	MEMORY_DISK_ROOT_SIZE=9300	# 4 Megabytes
 
 # CPU Support
 options 	DEC_2000_300	# "Jensen":	2000/300 (DECpc AXP 150)
diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK
index 6708d25866b9..9e9632d24fb0 100644
--- a/sys/arch/alpha/conf/RAMDISK
+++ b/sys/arch/alpha/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $NetBSD: RAMDISK,v 1.15 2002/03/10 19:56:38 lukem Exp $
+# $NetBSD: RAMDISK,v 1.16 2002/04/02 05:30:38 lukem Exp $
 #
 # Generic Alpha kernel with built-in RAM disk image.
 
@@ -7,4 +7,4 @@ include	"arch/alpha/conf/GENERIC"
 # Enable the hooks used for initializing the ram-disk.
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# Force root on ram-disk
-options 	MEMORY_DISK_SIZE=8192	# 4 Megabytes!
+options 	MEMORY_DISK_ROOT_SIZE=8192	# 4 Megabytes!
diff --git a/sys/arch/amiga/conf/MDINSTALL b/sys/arch/amiga/conf/MDINSTALL
index 0fd8dd3e95d9..3d2f6fb877b9 100644
--- a/sys/arch/amiga/conf/MDINSTALL
+++ b/sys/arch/amiga/conf/MDINSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: MDINSTALL,v 1.8 2002/03/10 19:56:38 lukem Exp $
+#	$NetBSD: MDINSTALL,v 1.9 2002/04/02 05:30:38 lukem Exp $
 
 #
 # INSTALL kernel for ramdisk installation
@@ -278,6 +278,6 @@ config	netbsd root on ? type ?
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=2048	# size of memory disk, in blocks
+options 	MEMORY_DISK_ROOT_SIZE=2048	# size of memory disk, in blocks
 
 pseudo-device	md		1	# memory disk [ramdisk]
diff --git a/sys/arch/amiga/conf/RAMDISK b/sys/arch/amiga/conf/RAMDISK
index b003d0d44b99..d2cfbd894bb6 100644
--- a/sys/arch/amiga/conf/RAMDISK
+++ b/sys/arch/amiga/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$NetBSD: RAMDISK,v 1.5 2002/03/10 19:56:38 lukem Exp $
+#	$NetBSD: RAMDISK,v 1.6 2002/04/02 05:30:38 lukem Exp $
 #
 # Amiga install kernel with built-in memory disk image.
 
@@ -8,6 +8,6 @@ include	"arch/amiga/conf/INSTALL"
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=8192	# size of memory disk, in blocks
+options 	MEMORY_DISK_ROOT_SIZE=8192	# size of memory disk, in blocks
 
 pseudo-device	md		1	# memory disk [ramdisk]
diff --git a/sys/arch/arc/conf/RAMDISK b/sys/arch/arc/conf/RAMDISK
index 976c49fa404a..43237500bff8 100644
--- a/sys/arch/arc/conf/RAMDISK
+++ b/sys/arch/arc/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$NetBSD: RAMDISK,v 1.26 2002/03/10 19:56:38 lukem Exp $
+#	$NetBSD: RAMDISK,v 1.27 2002/04/02 05:30:38 lukem Exp $
 #	$OpenBSD: RAMDISK,v 1.9 1999/08/29 12:14:03 niklas Exp $
 #
 #	memory disk based configuration file for MIPS R4x00 ARC Systems
@@ -24,7 +24,7 @@ options 	PLATFORM_SNI_RM200PCI
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=8192	# size of memory disk, in blocks
+options 	MEMORY_DISK_ROOT_SIZE=8192	# size of memory disk, in blocks
 
 makeoptions	COPTS="-Os"		# generates smaller code than -O2, -O1
 
diff --git a/sys/arch/arm/arm32/arm32_machdep.c b/sys/arch/arm/arm32/arm32_machdep.c
index 8e4a279c2066..d9e9e6a1cb5c 100644
--- a/sys/arch/arm/arm32/arm32_machdep.c
+++ b/sys/arch/arm/arm32/arm32_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: arm32_machdep.c,v 1.20 2002/03/24 03:37:18 thorpej Exp $	*/
+/*	$NetBSD: arm32_machdep.c,v 1.21 2002/04/02 05:30:39 lukem Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -76,9 +76,9 @@ extern int physmem;
 #ifndef PMAP_STATIC_L1S
 extern int max_processes;
 #endif	/* !PMAP_STATIC_L1S */
-#if NMD > 0 && defined(MEMORY_DISK_HOOKS) && !defined(MEMORY_DISK_SIZE)
+#if NMD > 0 && defined(MEMORY_DISK_HOOKS) && !defined(MEMORY_DISK_ROOT_SIZE)
 extern u_int memory_disc_size;		/* Memory disc size */
-#endif	/* NMD && MEMORY_DISK_HOOKS && !MEMORY_DISK_SIZE */
+#endif	/* NMD && MEMORY_DISK_HOOKS && !MEMORY_DISK_ROOT_SIZE */
 
 pv_addr_t systempage;
 pv_addr_t kernelstack;
@@ -423,7 +423,7 @@ parse_mi_bootargs(args)
 			max_processes = 255;
 	}
 #endif	/* !PMAP_STATUC_L1S */
-#if NMD > 0 && defined(MEMORY_DISK_HOOKS) && !defined(MEMORY_DISK_SIZE)
+#if NMD > 0 && 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)) {
 		memory_disc_size = integer;
@@ -433,7 +433,7 @@ parse_mi_bootargs(args)
 		if (memory_disc_size > 2048*1024)
 			memory_disc_size = 2048*1024;
 	}
-#endif	/* NMD && MEMORY_DISK_HOOKS && !MEMORY_DISK_SIZE */
+#endif	/* NMD && 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))
diff --git a/sys/arch/bebox/conf/INSTALL b/sys/arch/bebox/conf/INSTALL
index c959d24a24bf..e31175a0bd3d 100644
--- a/sys/arch/bebox/conf/INSTALL
+++ b/sys/arch/bebox/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.17 2002/03/10 19:56:39 lukem Exp $
+#	$NetBSD: INSTALL,v 1.18 2002/04/02 05:30:39 lukem Exp $
 #
 # First try for BEBOX config file
 #
@@ -13,7 +13,7 @@ makeoptions	COPTS="-Os"		# Optimise for space. Implies -O2
 options 		MEMORY_DISK_HOOKS
 options 		MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 		MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 		MEMORY_DISK_SIZE=3074	# size of memory disk, in blocks
+options 		MEMORY_DISK_ROOT_SIZE=3074	# size of memory disk, in blocks
 
 #options 	IPKDBUSERHACK	# Allow access to mapped memory via kgdb
 #options 	DEBUG_BY_TOOLS	# Allow debugging from toolsnet
diff --git a/sys/arch/cats/conf/GENERIC b/sys/arch/cats/conf/GENERIC
index 473c97a2b07f..bf5b02cb7ad2 100644
--- a/sys/arch/cats/conf/GENERIC
+++ b/sys/arch/cats/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.21 2002/03/10 19:56:40 lukem Exp $
+# $NetBSD: GENERIC,v 1.22 2002/04/02 05:30:39 lukem Exp $
 #
 # GENERIC machine description file
 # 
@@ -122,7 +122,7 @@ options 	SYSVSHM		# System V-like memory sharing
 # Device options
 
 #options 	MEMORY_DISK_HOOKS	# boottime setup of ramdisk
-#options 	MEMORY_DISK_SIZE=3400	# Size in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=3400	# Size in blocks
 #options 	MEMORY_DISK_IS_ROOT	# use memory disk as root
 
 # Miscellaneous kernel options
diff --git a/sys/arch/cats/conf/INSTALL b/sys/arch/cats/conf/INSTALL
index 313e2bb14777..2e2c886d48af 100644
--- a/sys/arch/cats/conf/INSTALL
+++ b/sys/arch/cats/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.13 2002/03/10 19:56:40 lukem Exp $
+#	$NetBSD: INSTALL,v 1.14 2002/04/02 05:30:39 lukem Exp $
 #
 #	CATSINST -- CHALTECH CATS Install kernel
 #
@@ -103,7 +103,7 @@ options 	COMPAT_13	# NetBSD 1.3 compatibility.
 # Device options
 
 options 	MEMORY_DISK_HOOKS	# boottime setup of ramdisk
-options 	MEMORY_DISK_SIZE=3800	# Size in blocks
+options 	MEMORY_DISK_ROOT_SIZE=3800	# Size in blocks
 options 	MEMORY_DISK_IS_ROOT	# use memory disk as root
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
 
diff --git a/sys/arch/dreamcast/conf/GENERIC b/sys/arch/dreamcast/conf/GENERIC
index 1544be3e675e..92ace2a04bbf 100644
--- a/sys/arch/dreamcast/conf/GENERIC
+++ b/sys/arch/dreamcast/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.20 2002/03/24 18:14:27 uch Exp $
+# $NetBSD: GENERIC,v 1.21 2002/04/02 05:30:39 lukem Exp $
 #
 # GENERIC machine description file
 # 
@@ -26,8 +26,8 @@ maxusers	16		# estimated number of users
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=2880	# size of memory disk, in blocks
-#options 	MEMORY_DISK_SIZE=6000
+options 	MEMORY_DISK_ROOT_SIZE=2880	# size of memory disk, in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=6000
 
 # CPU support
 options 	SH4
diff --git a/sys/arch/evbarm/conf/INTEGRATOR b/sys/arch/evbarm/conf/INTEGRATOR
index bbc23b6d7f22..77fa45f39d27 100644
--- a/sys/arch/evbarm/conf/INTEGRATOR
+++ b/sys/arch/evbarm/conf/INTEGRATOR
@@ -1,4 +1,4 @@
-#	$NetBSD: INTEGRATOR,v 1.6 2002/03/10 19:56:40 lukem Exp $
+#	$NetBSD: INTEGRATOR,v 1.7 2002/04/02 05:30:40 lukem Exp $
 #
 #	GENERIC -- ARM Integrator board Generic kernel
 #
@@ -102,7 +102,7 @@ options 	COMPAT_15	# NetBSD 1.5 compatibility.
 # Device options
 
 #options 	MEMORY_DISK_HOOKS	# boottime setup of ramdisk
-#options 	MEMORY_DISK_SIZE=4000	# Size in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=4000	# Size in blocks
 #options 	MEMORY_DISK_IS_ROOT	# use memory disk as root
 
 # Miscellaneous kernel options
diff --git a/sys/arch/evbarm/conf/IQ80310 b/sys/arch/evbarm/conf/IQ80310
index d4256766d655..bdc833b35f97 100644
--- a/sys/arch/evbarm/conf/IQ80310
+++ b/sys/arch/evbarm/conf/IQ80310
@@ -1,4 +1,4 @@
-#	$NetBSD: IQ80310,v 1.11 2002/03/26 19:29:46 thorpej Exp $
+#	$NetBSD: IQ80310,v 1.12 2002/04/02 05:30:40 lukem Exp $
 #
 #	IQ80310 -- Intel IQ80310 Evaluation Board Kernel
 #
@@ -98,7 +98,7 @@ options 	SHMMAXPGS=1024	# 1024 pages is the default
 # Device options
 
 #options 	MEMORY_DISK_HOOKS	# boottime setup of ramdisk
-#options 	MEMORY_DISK_SIZE=3400	# Size in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=3400	# Size in blocks
 #options 	MEMORY_DISK_IS_ROOT	# use memory disk as root
 
 # Console options.  The default console is on connector J9 ("com0") at
diff --git a/sys/arch/evbarm/conf/IQ80321 b/sys/arch/evbarm/conf/IQ80321
index c9a2e088ad4f..379b8a42c0c9 100644
--- a/sys/arch/evbarm/conf/IQ80321
+++ b/sys/arch/evbarm/conf/IQ80321
@@ -1,4 +1,4 @@
-#	$NetBSD: IQ80321,v 1.2 2002/03/29 20:29:30 thorpej Exp $
+#	$NetBSD: IQ80321,v 1.3 2002/04/02 05:30:40 lukem Exp $
 #
 #	IQ80321 -- Intel IQ80321 Evaluation Board Kernel
 #
@@ -98,8 +98,7 @@ options 	SHMMAXPGS=1024	# 1024 pages is the default
 # Device options
 
 #options 	MEMORY_DISK_HOOKS	# boottime setup of ramdisk
-#options 	MEMORY_DISK_SIZE=0	# Size in blocks
-#options 	MINIROOTSIZE=3400	# Size in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=3400	# Size in blocks
 #options 	MEMORY_DISK_IS_ROOT	# use memory disk as root
 
 # Console options.  The default console is speed is 115200 baud.
diff --git a/sys/arch/evbarm/conf/TEAMASA_NPWR b/sys/arch/evbarm/conf/TEAMASA_NPWR
index e1c822138894..1aa1e17405ed 100644
--- a/sys/arch/evbarm/conf/TEAMASA_NPWR
+++ b/sys/arch/evbarm/conf/TEAMASA_NPWR
@@ -1,4 +1,4 @@
-#	$NetBSD: TEAMASA_NPWR,v 1.5 2002/03/26 19:29:46 thorpej Exp $
+#	$NetBSD: TEAMASA_NPWR,v 1.6 2002/04/02 05:30:40 lukem Exp $
 #
 #	TEAMASA_NPWR -- Team ASA, Inc. Npwr -- XScale/IOP310-based
 #	server appliance.
@@ -100,7 +100,7 @@ options 	SHMMAXPGS=1024	# 1024 pages is the default
 # Device options
 
 #options 	MEMORY_DISK_HOOKS	# boottime setup of ramdisk
-#options 	MEMORY_DISK_SIZE=3400	# Size in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=3400	# Size in blocks
 #options 	MEMORY_DISK_IS_ROOT	# use memory disk as root
 
 # Console options.  The default console is oriented towards the IQ80310
diff --git a/sys/arch/evbmips/conf/MALTA b/sys/arch/evbmips/conf/MALTA
index 4dec9f3ce2de..60413c6e5587 100644
--- a/sys/arch/evbmips/conf/MALTA
+++ b/sys/arch/evbmips/conf/MALTA
@@ -1,9 +1,9 @@
-#	$NetBSD: MALTA,v 1.3 2002/03/23 14:51:28 simonb Exp $
+#	$NetBSD: MALTA,v 1.4 2002/04/02 05:30:40 lukem Exp $
 
 #include 	"arch/evbmips/conf/std.malta.eb"	# big-endian mode
 include 	"arch/evbmips/conf/std.malta.el"	# little-endian mode
 
-#ident 		"GENERIC-$Revision: 1.3 $"
+#ident 		"GENERIC-$Revision: 1.4 $"
 
 maxusers	32
 
@@ -15,8 +15,8 @@ options 	SOFTFLOAT	# emulate FPU insn
 # options 	MEMORY_DISK_HOOKS
 # options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 # options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-# options 	MEMORY_DISK_SIZE=6144	# size of memory disk, in blocks
-#options 	MEMORY_DISK_SIZE=16384	# size of memory disk, in blocks
+# options 	MEMORY_DISK_ROOT_SIZE=6144	# size of memory disk, in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=16384	# size of memory disk, in blocks
 
 # Standard system options
 options 	KTRACE		# system call tracing support
diff --git a/sys/arch/evbsh3/conf/COMPUTEX7750 b/sys/arch/evbsh3/conf/COMPUTEX7750
index 5dbff21c8dba..1f4f73082c54 100644
--- a/sys/arch/evbsh3/conf/COMPUTEX7750
+++ b/sys/arch/evbsh3/conf/COMPUTEX7750
@@ -1,4 +1,4 @@
-#	$NetBSD: COMPUTEX7750,v 1.13 2002/03/24 18:21:14 uch Exp $
+#	$NetBSD: COMPUTEX7750,v 1.14 2002/04/02 05:30:41 lukem Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -12,7 +12,7 @@ include "arch/evbsh3/conf/std.evbsh3.eb"
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=2880	# size of memory disk, in blocks
+options 	MEMORY_DISK_ROOT_SIZE=2880	# size of memory disk, in blocks
 
 maxusers	16		# estimated number of users
 
diff --git a/sys/arch/evbsh3/conf/COMPUTEXEVB b/sys/arch/evbsh3/conf/COMPUTEXEVB
index 580f6f80a8ec..36492da88bda 100644
--- a/sys/arch/evbsh3/conf/COMPUTEXEVB
+++ b/sys/arch/evbsh3/conf/COMPUTEXEVB
@@ -1,4 +1,4 @@
-#	$NetBSD: COMPUTEXEVB,v 1.16 2002/03/24 18:21:15 uch Exp $
+#	$NetBSD: COMPUTEXEVB,v 1.17 2002/04/02 05:30:41 lukem Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -12,7 +12,7 @@ include "arch/evbsh3/conf/std.evbsh3.eb"
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=3074	# size of memory disk, in blocks
+options 	MEMORY_DISK_ROOT_SIZE=3074	# size of memory disk, in blocks
 
 maxusers	32		# estimated number of users
 
diff --git a/sys/arch/evbsh3/conf/CQREEKSH3 b/sys/arch/evbsh3/conf/CQREEKSH3
index f75724eb913b..1e1d017173b3 100644
--- a/sys/arch/evbsh3/conf/CQREEKSH3
+++ b/sys/arch/evbsh3/conf/CQREEKSH3
@@ -1,4 +1,4 @@
-#	$NetBSD: CQREEKSH3,v 1.17 2002/03/24 18:21:15 uch Exp $
+#	$NetBSD: CQREEKSH3,v 1.18 2002/04/02 05:30:41 lukem Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -12,7 +12,7 @@ include "arch/evbsh3/conf/std.evbsh3.eb"
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=2400	# size of memory disk, in blocks
+options 	MEMORY_DISK_ROOT_SIZE=2400	# size of memory disk, in blocks
 
 options 	ROMIMAGE
 
diff --git a/sys/arch/evbsh3/conf/KZSH401 b/sys/arch/evbsh3/conf/KZSH401
index 0baea28eca70..6648dc8ce964 100644
--- a/sys/arch/evbsh3/conf/KZSH401
+++ b/sys/arch/evbsh3/conf/KZSH401
@@ -1,4 +1,4 @@
-#	$NetBSD: KZSH401,v 1.14 2002/03/24 18:21:15 uch Exp $
+#	$NetBSD: KZSH401,v 1.15 2002/04/02 05:30:41 lukem Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -12,7 +12,7 @@ include "arch/evbsh3/conf/std.evbsh3.eb"
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=2880	# size of memory disk, in blocks
+options 	MEMORY_DISK_ROOT_SIZE=2880	# size of memory disk, in blocks
 
 maxusers	16		# estimated number of users
 
diff --git a/sys/arch/hp300/conf/RAMDISK b/sys/arch/hp300/conf/RAMDISK
index 9599453a4ac5..48d0a3589dcb 100644
--- a/sys/arch/hp300/conf/RAMDISK
+++ b/sys/arch/hp300/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $NetBSD: RAMDISK,v 1.5 2002/03/17 05:43:18 gmcgarry Exp $
+# $NetBSD: RAMDISK,v 1.6 2002/04/02 05:30:41 lukem Exp $
 #
 # RAMDISK machine description file
 #
@@ -11,6 +11,6 @@ include 	"arch/hp300/conf/INSTALL"
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=2400	# size of memory disk, in blocks (1.2MB)
+options 	MEMORY_DISK_ROOT_SIZE=2400	# size of memory disk, in blocks (1.2MB)
 
 pseudo-device 	md		1	# memory disk device (ramdisk)
diff --git a/sys/arch/hpcarm/conf/IPAQ b/sys/arch/hpcarm/conf/IPAQ
index c2206add45d0..0af5b34bce76 100644
--- a/sys/arch/hpcarm/conf/IPAQ
+++ b/sys/arch/hpcarm/conf/IPAQ
@@ -1,4 +1,4 @@
-#	$NetBSD: IPAQ,v 1.14 2002/03/10 19:56:41 lukem Exp $
+#	$NetBSD: IPAQ,v 1.15 2002/04/02 05:30:41 lukem Exp $
 #
 #	iPAQ H3600 -- Windows-CE based PDA
 #
@@ -94,7 +94,7 @@ options 	SHMMAXPGS=1024	# 1024 pages is the default
 # Device options
 
 options 	MEMORY_DISK_HOOKS	# boottime setup of ramdisk
-#options 	MEMORY_DISK_SIZE=3400	# Size in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=3400	# Size in blocks
 #options 	MEMORY_DISK_IS_ROOT	# use memory disk as root
 
 # Miscellaneous kernel options
diff --git a/sys/arch/hpcarm/conf/JORNADA720 b/sys/arch/hpcarm/conf/JORNADA720
index 2ba79a551eda..9fa34642b800 100644
--- a/sys/arch/hpcarm/conf/JORNADA720
+++ b/sys/arch/hpcarm/conf/JORNADA720
@@ -1,11 +1,11 @@
-#	$NetBSD: JORNADA720,v 1.14 2002/03/10 19:56:41 lukem Exp $
+#	$NetBSD: JORNADA720,v 1.15 2002/04/02 05:30:41 lukem Exp $
 #
 #	JORNADA -- Windows-CE based jornada 720
 #
 
 include	"arch/hpcarm/conf/std.hpcarm"
 
-#ident 		"GENERIC-$Revision: 1.14 $"
+#ident 		"GENERIC-$Revision: 1.15 $"
 
 # estimated number of users
 maxusers	32
@@ -96,7 +96,7 @@ options 	SHMMAXPGS=1024	# 1024 pages is the default
 # Device options
 
 options 	MEMORY_DISK_HOOKS	# boottime setup of ramdisk
-#options 	MEMORY_DISK_SIZE=3400	# Size in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=3400	# Size in blocks
 #options 	MEMORY_DISK_IS_ROOT	# use memory disk as root
 
 # Miscellaneous kernel options
diff --git a/sys/arch/hpcmips/conf/INSTALL_TX3912 b/sys/arch/hpcmips/conf/INSTALL_TX3912
index 66180eb276dd..2c6ba7f512f6 100644
--- a/sys/arch/hpcmips/conf/INSTALL_TX3912
+++ b/sys/arch/hpcmips/conf/INSTALL_TX3912
@@ -1,7 +1,7 @@
 #
 # kernel config file for system install
 #
-# 	$NetBSD: INSTALL_TX3912,v 1.3 2002/03/10 19:56:41 lukem Exp $
+# 	$NetBSD: INSTALL_TX3912,v 1.4 2002/04/02 05:30:42 lukem Exp $
 #
 
 include		"arch/hpcmips/conf/TX3912"
@@ -12,6 +12,6 @@ pseudo-device	sl		2	# Serial Line IP
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=8192	# size of memory disk, in blocks
+options 	MEMORY_DISK_ROOT_SIZE=8192	# size of memory disk, in blocks
 
 options		PIPE_SOCKETPAIR		# smaller, but slower pipe(2)
diff --git a/sys/arch/hpcmips/conf/RAMDISK b/sys/arch/hpcmips/conf/RAMDISK
index 7ebb01f5060a..75f70acfb716 100644
--- a/sys/arch/hpcmips/conf/RAMDISK
+++ b/sys/arch/hpcmips/conf/RAMDISK
@@ -1,7 +1,7 @@
 #
 # kernel config file for memory(RAM) disk
 #
-# 	$NetBSD: RAMDISK,v 1.15 2002/03/10 19:56:42 lukem Exp $
+# 	$NetBSD: RAMDISK,v 1.16 2002/04/02 05:30:42 lukem Exp $
 #
 
 include		"arch/hpcmips/conf/GENERIC"
@@ -13,4 +13,4 @@ pseudo-device	sl		2	# Serial Line IP
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=8192	# size of memory disk, in blocks
+options 	MEMORY_DISK_ROOT_SIZE=8192	# size of memory disk, in blocks
diff --git a/sys/arch/hpcmips/conf/TX3912 b/sys/arch/hpcmips/conf/TX3912
index 936d2ca054b3..78877a11f45d 100644
--- a/sys/arch/hpcmips/conf/TX3912
+++ b/sys/arch/hpcmips/conf/TX3912
@@ -2,7 +2,7 @@
 # Distribution kernel (TOSHIBA TX3912 based model) kernel config file
 
 #
-#	$NetBSD: TX3912,v 1.39 2002/03/10 19:56:42 lukem Exp $
+#	$NetBSD: TX3912,v 1.40 2002/04/02 05:30:42 lukem Exp $
 #
 include		"arch/hpcmips/conf/std.hpcmips"
 
@@ -27,13 +27,13 @@ options 	DIAGNOSTIC		# extra kernel debugging checks
 options 	DEBUG			# extra kernel debugging support
 options 	KTRACE			# system call tracing support
 #options 	SYSCALL_DEBUG		# for debug
-#options 	 MEMORY_DISK_SIZE=10000
+#options 	MEMORY_DISK_ROOT_SIZE=10000
 options 	MSGBUFSIZE=65534	# for dmesg
 
 #options 	MEMORY_DISK_HOOKS
 #options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 #options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-#options 	MEMORY_DISK_SIZE=12288	# size of memory disk, in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=12288	# size of memory disk, in blocks
 
 options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
 options 	PPP_DEFLATE	# Deflate compression support for PPP
diff --git a/sys/arch/i386/conf/INSTALL b/sys/arch/i386/conf/INSTALL
index 378795a321ed..65b23a5bfa7b 100644
--- a/sys/arch/i386/conf/INSTALL
+++ b/sys/arch/i386/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.187 2002/03/29 04:53:31 ichiro Exp $
+#	$NetBSD: INSTALL,v 1.188 2002/04/02 05:30:42 lukem Exp $
 #
 #	INSTALL - Installation kernel.
 #
@@ -17,8 +17,8 @@ makeoptions	COPTS="-Os"		# Optimise for space. Implies -O2
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=4096	# size of memory disk, in blocks
-#options 	MEMORY_DISK_SIZE=2880	# 1.44M, same as a floppy
+options 	MEMORY_DISK_ROOT_SIZE=4096	# size of memory disk, in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=2880	# 1.44M, same as a floppy
 
 maxusers	32		# estimated number of users
 
diff --git a/sys/arch/i386/conf/INSTALL_LAPTOP b/sys/arch/i386/conf/INSTALL_LAPTOP
index 9070b3d84ea8..9ba781c32256 100644
--- a/sys/arch/i386/conf/INSTALL_LAPTOP
+++ b/sys/arch/i386/conf/INSTALL_LAPTOP
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL_LAPTOP,v 1.24 2002/03/29 04:53:32 ichiro Exp $
+#	$NetBSD: INSTALL_LAPTOP,v 1.25 2002/04/02 05:30:42 lukem Exp $
 #
 #	INSTALL - Installation kernel.
 #
@@ -15,8 +15,8 @@ include "arch/i386/conf/std.i386"
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=4096	# size of memory disk, in blocks
-#options 	MEMORY_DISK_SIZE=2880	# 1.44M, same as a floppy
+options 	MEMORY_DISK_ROOT_SIZE=4096	# size of memory disk, in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=2880	# 1.44M, same as a floppy
 
 makeoptions	COPTS="-Os"		# generates smaller code than -O2, -O1
 
diff --git a/sys/arch/i386/conf/INSTALL_PS2 b/sys/arch/i386/conf/INSTALL_PS2
index 525de63feaf2..eddb74c014b8 100644
--- a/sys/arch/i386/conf/INSTALL_PS2
+++ b/sys/arch/i386/conf/INSTALL_PS2
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL_PS2,v 1.6 2002/03/10 19:56:42 lukem Exp $
+#	$NetBSD: INSTALL_PS2,v 1.7 2002/04/02 05:30:42 lukem Exp $
 #
 #	INSTALL_PS2 - PS/2 Installation kernel.
 #
@@ -12,7 +12,7 @@ include "arch/i386/conf/GENERIC_PS2TINY"
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=2880	# 1.44M, same as a floppy
+options 	MEMORY_DISK_ROOT_SIZE=2880	# 1.44M, same as a floppy
 
 options		PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
 
diff --git a/sys/arch/i386/conf/INSTALL_SMALL b/sys/arch/i386/conf/INSTALL_SMALL
index 39bfc229e1a8..8bd14db23b04 100644
--- a/sys/arch/i386/conf/INSTALL_SMALL
+++ b/sys/arch/i386/conf/INSTALL_SMALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL_SMALL,v 1.78 2002/03/10 19:56:42 lukem Exp $
+#	$NetBSD: INSTALL_SMALL,v 1.79 2002/04/02 05:30:42 lukem Exp $
 #
 #	INSTALL_SMALL - Small Installation kernel.
 #
@@ -18,7 +18,7 @@ include "arch/i386/conf/std.i386"
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=2880	# 1.44M, same as a floppy
+options 	MEMORY_DISK_ROOT_SIZE=2880	# 1.44M, same as a floppy
 
 makeoptions	COPTS="-Os"		# generates smaller code than -O2, -O1
 
diff --git a/sys/arch/i386/conf/INSTALL_TINY b/sys/arch/i386/conf/INSTALL_TINY
index 9483b84b7812..2ee6b13fc167 100644
--- a/sys/arch/i386/conf/INSTALL_TINY
+++ b/sys/arch/i386/conf/INSTALL_TINY
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL_TINY,v 1.46 2002/03/10 19:56:42 lukem Exp $
+#	$NetBSD: INSTALL_TINY,v 1.47 2002/04/02 05:30:43 lukem Exp $
 #
 #	INSTALL_TINY - Tiny Installation kernel, suitable for 4M machines.
 #
@@ -18,7 +18,7 @@ makeoptions	COPTS="-Os"		# Optimise for space. Implies -O2
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=2880	# 1.44M, same as a floppy
+options 	MEMORY_DISK_ROOT_SIZE=2880	# 1.44M, same as a floppy
 
 maxusers	2		# estimated number of users
 
diff --git a/sys/arch/mac68k/conf/INSTALL b/sys/arch/mac68k/conf/INSTALL
index bd0e707dbb67..396bc393cb20 100644
--- a/sys/arch/mac68k/conf/INSTALL
+++ b/sys/arch/mac68k/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.13 2002/03/10 19:56:42 lukem Exp $
+#	$NetBSD: INSTALL,v 1.14 2002/04/02 05:30:43 lukem Exp $
 #
 # INSTALL
 
@@ -11,7 +11,7 @@ maxusers	8		# estimated number of users
 # Enable the hooks used for initializing the ram-disk.
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT 	# Force root on ram-disk
-options 	MEMORY_DISK_SIZE=5120	# 2.5 MB
+options 	MEMORY_DISK_ROOT_SIZE=5120	# 2.5 MB
 
 # CPU support.  At least one is REQUIRED.
 options 	M68040
diff --git a/sys/arch/mac68k/conf/INSTALLSBC b/sys/arch/mac68k/conf/INSTALLSBC
index aade1701ce39..94cd33fcf5f0 100644
--- a/sys/arch/mac68k/conf/INSTALLSBC
+++ b/sys/arch/mac68k/conf/INSTALLSBC
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALLSBC,v 1.5 2002/03/10 19:56:43 lukem Exp $
+#	$NetBSD: INSTALLSBC,v 1.6 2002/04/02 05:30:43 lukem Exp $
 #
 # INSTALLSBC
 
@@ -11,7 +11,7 @@ maxusers	8		# estimated number of users
 # Enable the hooks used for initializing the ram-disk.
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT 	# Force root on ram-disk
-options 	MEMORY_DISK_SIZE=5120	# 2.5 MB
+options 	MEMORY_DISK_ROOT_SIZE=5120	# 2.5 MB
 
 # CPU support.  At least one is REQUIRED.
 options 	M68040
diff --git a/sys/arch/mac68k/conf/RAMDISK b/sys/arch/mac68k/conf/RAMDISK
index 8d2261551c63..c4ec946f1c90 100644
--- a/sys/arch/mac68k/conf/RAMDISK
+++ b/sys/arch/mac68k/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$NetBSD: RAMDISK,v 1.13 2002/03/10 19:56:43 lukem Exp $
+#	$NetBSD: RAMDISK,v 1.14 2002/04/02 05:30:43 lukem Exp $
 #
 # Generic mac68k kernel with built-in RAM disk image.
 
@@ -6,4 +6,4 @@ include	"arch/mac68k/conf/GENERIC"
 
 # Enable the hooks used for initializing the ram-disk.
 options 	MEMORY_DISK_HOOKS
-options 	MEMORY_DISK_SIZE=5120	# 2.5 MB
+options 	MEMORY_DISK_ROOT_SIZE=5120	# 2.5 MB
diff --git a/sys/arch/macppc/conf/GENERIC_MD b/sys/arch/macppc/conf/GENERIC_MD
index 88452896614b..46ce5f1e419c 100644
--- a/sys/arch/macppc/conf/GENERIC_MD
+++ b/sys/arch/macppc/conf/GENERIC_MD
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC_MD,v 1.6 2002/03/10 19:56:43 lukem Exp $
+#	$NetBSD: GENERIC_MD,v 1.7 2002/04/02 05:30:43 lukem Exp $
 #
 # GENERIC_MD config file
 #
@@ -11,4 +11,4 @@ makeoptions	TEXTADDR=0x800000
 # Enable the hooks used for initializing the ram-disk.
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# Force root on ram-disk
-options 	MEMORY_DISK_SIZE=4096	# 2 Megabytes
+options 	MEMORY_DISK_ROOT_SIZE=4096	# 2 Megabytes
diff --git a/sys/arch/macppc/conf/INSTALL b/sys/arch/macppc/conf/INSTALL
index a0a808802d7c..c1cc26c8c8a3 100644
--- a/sys/arch/macppc/conf/INSTALL
+++ b/sys/arch/macppc/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.57 2002/03/30 07:08:55 tsutsui Exp $
+#	$NetBSD: INSTALL,v 1.58 2002/04/02 05:30:43 lukem Exp $
 #
 # config file for INSTALL FLOPPY
 #
@@ -18,7 +18,7 @@ makeoptions	TEXTADDR=0x800000
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# Force root on ram-disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=4096	# 2 Megabytes
+options 	MEMORY_DISK_ROOT_SIZE=4096	# 2 Megabytes
 
 options		PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
 
diff --git a/sys/arch/mipsco/conf/RAMDISK b/sys/arch/mipsco/conf/RAMDISK
index f62f742db489..0dd0ed9818e7 100644
--- a/sys/arch/mipsco/conf/RAMDISK
+++ b/sys/arch/mipsco/conf/RAMDISK
@@ -1,4 +1,4 @@
-# 	$NetBSD: RAMDISK,v 1.2 2002/03/10 19:56:43 lukem Exp $
+# 	$NetBSD: RAMDISK,v 1.3 2002/04/02 05:30:44 lukem Exp $
 #
 # Install kernel with ramdisk added.
 #
@@ -10,7 +10,7 @@ include	"arch/mipsco/conf/INSTALL"
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=6144	# size of memory disk, in blocks (3MB)
+options 	MEMORY_DISK_ROOT_SIZE=6144	# size of memory disk, in blocks (3MB)
 
 # File systems: need MFS
 file-system 	MFS		# memory file system
diff --git a/sys/arch/mmeye/conf/GENERIC b/sys/arch/mmeye/conf/GENERIC
index 56ec032d8442..4d2e633dfe5f 100644
--- a/sys/arch/mmeye/conf/GENERIC
+++ b/sys/arch/mmeye/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.36 2002/03/24 18:21:21 uch Exp $
+# $NetBSD: GENERIC,v 1.37 2002/04/02 05:30:44 lukem Exp $
 #
 # GENERIC machine description file
 # 
@@ -20,7 +20,7 @@
 
 include 	"arch/mmeye/conf/std.mmeye"
 
-#ident 		"GENERIC-$Revision: 1.36 $"
+#ident 		"GENERIC-$Revision: 1.37 $"
 
 maxusers	16		# estimated number of users
 
@@ -196,4 +196,4 @@ pseudo-device	vcoda		4	# coda minicache <-> venus comm.
 #options 	MEMORY_DISK_HOOKS
 #options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 #options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-#options 	MEMORY_DISK_SIZE=3074	# size of memory disk, in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=3074	# size of memory disk, in blocks
diff --git a/sys/arch/mmeye/conf/MMEYE b/sys/arch/mmeye/conf/MMEYE
index 4c2bc1dfb384..661c1e82112d 100644
--- a/sys/arch/mmeye/conf/MMEYE
+++ b/sys/arch/mmeye/conf/MMEYE
@@ -1,4 +1,4 @@
-#	$NetBSD: MMEYE,v 1.11 2002/03/10 19:56:43 lukem Exp $
+#	$NetBSD: MMEYE,v 1.12 2002/04/02 05:30:44 lukem Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -101,6 +101,6 @@ pseudo-device	pty			# pseudo-terminals
 #options 	MEMORY_DISK_HOOKS
 #options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 #options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-#options 	MEMORY_DISK_SIZE=3074	# size of memory disk, in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=3074	# size of memory disk, in blocks
 
 #pseudo-device	md		1	# memory disk device (ramdisk)
diff --git a/sys/arch/mmeye/conf/MMTA b/sys/arch/mmeye/conf/MMTA
index a85b9ee8cb5e..e53acd01f530 100644
--- a/sys/arch/mmeye/conf/MMTA
+++ b/sys/arch/mmeye/conf/MMTA
@@ -1,4 +1,4 @@
-#	$NetBSD: MMTA,v 1.13 2002/03/10 19:56:43 lukem Exp $
+#	$NetBSD: MMTA,v 1.14 2002/04/02 05:30:44 lukem Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -9,7 +9,7 @@ include "arch/mmeye/conf/std.mmeye"
 #options 	MEMORY_DISK_HOOKS
 #options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 #options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-#options 	MEMORY_DISK_SIZE=3074	# size of memory disk, in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=3074	# size of memory disk, in blocks
 
 maxusers	32			# estimated number of users
 
diff --git a/sys/arch/mmeye/conf/MMTAICE b/sys/arch/mmeye/conf/MMTAICE
index b1fafe5ade75..835d28334173 100644
--- a/sys/arch/mmeye/conf/MMTAICE
+++ b/sys/arch/mmeye/conf/MMTAICE
@@ -1,4 +1,4 @@
-#	$NetBSD: MMTAICE,v 1.12 2002/03/10 19:56:43 lukem Exp $
+#	$NetBSD: MMTAICE,v 1.13 2002/04/02 05:30:44 lukem Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -9,7 +9,7 @@ include "arch/mmeye/conf/std.mmeye"
 #options 	MEMORY_DISK_HOOKS
 #options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 #options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-#options 	MEMORY_DISK_SIZE=3074	# size of memory disk, in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=3074	# size of memory disk, in blocks
 
 maxusers	32		# estimated number of users
 
diff --git a/sys/arch/mmeye/conf/MMTANEW b/sys/arch/mmeye/conf/MMTANEW
index 9ae40149dcbe..c0ee2d16a48a 100644
--- a/sys/arch/mmeye/conf/MMTANEW
+++ b/sys/arch/mmeye/conf/MMTANEW
@@ -1,4 +1,4 @@
-#	$NetBSD: MMTANEW,v 1.12 2002/03/10 19:56:43 lukem Exp $
+#	$NetBSD: MMTANEW,v 1.13 2002/04/02 05:30:44 lukem Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -9,7 +9,7 @@ include "arch/mmeye/conf/std.mmeye"
 #options 	MEMORY_DISK_HOOKS
 #options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 #options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-#options 	MEMORY_DISK_SIZE=3074	# size of memory disk, in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=3074	# size of memory disk, in blocks
 
 maxusers	32		# estimated number of users
 
diff --git a/sys/arch/mmeye/conf/MMTAROMNEW b/sys/arch/mmeye/conf/MMTAROMNEW
index dd4488cde7f2..6fb6cad382b0 100644
--- a/sys/arch/mmeye/conf/MMTAROMNEW
+++ b/sys/arch/mmeye/conf/MMTAROMNEW
@@ -1,4 +1,4 @@
-#	$NetBSD: MMTAROMNEW,v 1.12 2002/03/10 19:56:43 lukem Exp $
+#	$NetBSD: MMTAROMNEW,v 1.13 2002/04/02 05:30:44 lukem Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -9,7 +9,7 @@ include "arch/mmeye/conf/std.mmeye"
 #options 	MEMORY_DISK_HOOKS
 #options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 #options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-#options 	MEMORY_DISK_SIZE=3074	# size of memory disk, in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=3074	# size of memory disk, in blocks
 
 options 	ROMIMAGE
 
diff --git a/sys/arch/mvme68k/conf/RAMDISK b/sys/arch/mvme68k/conf/RAMDISK
index ba8f40414c93..dc0e6bbc9eb5 100644
--- a/sys/arch/mvme68k/conf/RAMDISK
+++ b/sys/arch/mvme68k/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$NetBSD: RAMDISK,v 1.14 2002/03/24 18:10:54 scw Exp $
+#	$NetBSD: RAMDISK,v 1.15 2002/04/02 05:30:45 lukem Exp $
 
 #
 # RAMDISK: Root/swap on ramdisk
@@ -40,7 +40,7 @@ options 	INET6		# IPV6
 # Enable the hooks used for initializing the ram-disk.
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT
-options 	MEMORY_DISK_SIZE=1600
+options 	MEMORY_DISK_ROOT_SIZE=1600
 
 options		PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
 
diff --git a/sys/arch/netwinder/conf/GENERIC b/sys/arch/netwinder/conf/GENERIC
index 54b534c4ea2f..f882212a5dcb 100644
--- a/sys/arch/netwinder/conf/GENERIC
+++ b/sys/arch/netwinder/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.15 2002/03/10 19:56:44 lukem Exp $
+# $NetBSD: GENERIC,v 1.16 2002/04/02 05:30:45 lukem Exp $
 #
 # GENERIC machine description file
 # 
@@ -118,7 +118,7 @@ options 	SHMMAXPGS=1024	# 1024 pages is the default
 # Device options
 
 #options 	MEMORY_DISK_HOOKS	# boottime setup of ramdisk
-#options 	MEMORY_DISK_SIZE=3400	# Size in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=3400	# Size in blocks
 #options 	MEMORY_DISK_IS_ROOT	# use memory disk as root
 
 # Miscellaneous kernel options
diff --git a/sys/arch/news68k/conf/INSTALL b/sys/arch/news68k/conf/INSTALL
index 70b48b0d1327..a395e50f1e56 100644
--- a/sys/arch/news68k/conf/INSTALL
+++ b/sys/arch/news68k/conf/INSTALL
@@ -1,4 +1,4 @@
-# 	$NetBSD: INSTALL,v 1.16 2002/03/10 19:56:44 lukem Exp $
+# 	$NetBSD: INSTALL,v 1.17 2002/04/02 05:30:46 lukem Exp $
 
 #	config for bootable floppy kernel
 #
@@ -16,7 +16,7 @@ options 	CPU_SINGLE		# Will IOP be supported eventually?
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# Force root on ram-disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=2880	# 1.44 Megabytes
+options 	MEMORY_DISK_ROOT_SIZE=2880	# 1.44 Megabytes
 
 # Standard system options
 #options 	KTRACE			# system call tracing support
diff --git a/sys/arch/newsmips/conf/INSTALL b/sys/arch/newsmips/conf/INSTALL
index b27342d45957..21bf6444401a 100644
--- a/sys/arch/newsmips/conf/INSTALL
+++ b/sys/arch/newsmips/conf/INSTALL
@@ -1,4 +1,4 @@
-# 	$NetBSD: INSTALL,v 1.10 2002/03/16 16:50:34 tsutsui Exp $
+# 	$NetBSD: INSTALL,v 1.11 2002/04/02 05:30:46 lukem Exp $
 #
 #	INSTALL kernel for RISC-NEWS
 
@@ -12,7 +12,7 @@ maxusers	8
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# Force root on ram-disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=4096	# 2 Megabytes
+options 	MEMORY_DISK_ROOT_SIZE=4096	# 2 Megabytes
 
 options 	news3400
 options 	news5000
diff --git a/sys/arch/next68k/conf/RAMDISK b/sys/arch/next68k/conf/RAMDISK
index 5581b205d638..3a52c5afe3d3 100644
--- a/sys/arch/next68k/conf/RAMDISK
+++ b/sys/arch/next68k/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$NetBSD: RAMDISK,v 1.2 2002/03/10 19:56:44 lukem Exp $
+#	$NetBSD: RAMDISK,v 1.3 2002/04/02 05:30:46 lukem Exp $
 
 #
 # RAMDISK: Root/swap on ramdisk
@@ -9,4 +9,4 @@ include 	"arch/next68k/conf/GENERIC"
 # Enable the hooks used for initializing the ram-disk.
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT
-options 	MEMORY_DISK_SIZE=768
+options 	MEMORY_DISK_ROOT_SIZE=768
diff --git a/sys/arch/pc532/conf/INSTALL b/sys/arch/pc532/conf/INSTALL
index 32469275b1ba..b2855f45a5d8 100644
--- a/sys/arch/pc532/conf/INSTALL
+++ b/sys/arch/pc532/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.25 2002/03/10 19:56:45 lukem Exp $
+#	$NetBSD: INSTALL,v 1.26 2002/04/02 05:30:47 lukem Exp $
 #
 # INSTALL -- install kernel
 #
@@ -12,7 +12,7 @@ makeoptions	COPTS="-Os -msb"	# Don't inline, save space
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=4096	# size of memory disk, in blocks
+options 	MEMORY_DISK_ROOT_SIZE=4096	# size of memory disk, in blocks
 
 # estimated number of users
 maxusers	2
diff --git a/sys/arch/playstation2/conf/RAMDISK b/sys/arch/playstation2/conf/RAMDISK
index 2650ad4a1708..24c2450ee942 100644
--- a/sys/arch/playstation2/conf/RAMDISK
+++ b/sys/arch/playstation2/conf/RAMDISK
@@ -1,7 +1,7 @@
 #
 # kernel config file for memory(RAM) disk
 #
-# 	$NetBSD: RAMDISK,v 1.4 2002/03/10 19:56:45 lukem Exp $
+# 	$NetBSD: RAMDISK,v 1.5 2002/04/02 05:30:47 lukem Exp $
 #
 
 include 	"arch/playstation2/conf/std.playstation2"
@@ -18,7 +18,7 @@ pseudo-device	md		1	# memory disk device (ramdisk)
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=10240	# size of memory disk, in blocks
+options 	MEMORY_DISK_ROOT_SIZE=10240	# size of memory disk, in blocks
 
 # Reboot from HDD
 options 	KLOADER_KERNEL_PATH="\"/mnt/netbsd\""
diff --git a/sys/arch/pmax/conf/RAMDISK b/sys/arch/pmax/conf/RAMDISK
index f256e88401e7..6de7b695241b 100644
--- a/sys/arch/pmax/conf/RAMDISK
+++ b/sys/arch/pmax/conf/RAMDISK
@@ -1,4 +1,4 @@
-# 	$NetBSD: RAMDISK,v 1.4 2002/03/10 19:56:45 lukem Exp $
+# 	$NetBSD: RAMDISK,v 1.5 2002/04/02 05:30:47 lukem Exp $
 #
 # Install kernel with ramdisk added.
 # The ramdisk is be too big to netboot directly via ECOFF on some machines,
@@ -13,8 +13,8 @@ include	"arch/pmax/conf/INSTALL"
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=6144	# size of memory disk, in blocks (3MB)
-#options 	MEMORY_DISK_SIZE=2880	# 1.44M, same as a floppy
+options 	MEMORY_DISK_ROOT_SIZE=6144	# size of memory disk, in blocks (3MB)
+#options 	MEMORY_DISK_ROOT_SIZE=2880	# 1.44M, same as a floppy
 
 # File systems: need MFS
 file-system 	MFS		# memory file system
diff --git a/sys/arch/prep/conf/INSTALL b/sys/arch/prep/conf/INSTALL
index 6e0fe1cf05e8..03e25e5a95e2 100644
--- a/sys/arch/prep/conf/INSTALL
+++ b/sys/arch/prep/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.11 2002/03/10 19:56:45 lukem Exp $
+#	$NetBSD: INSTALL,v 1.12 2002/04/02 05:30:48 lukem Exp $
 #
 #	INSTALL -- Installation kernel
 #
@@ -10,7 +10,7 @@ makeoptions	COPTS="-Os -mmultiple"	# -Os -mmultiple to reduce size.
 # Enable the hooks used for initializing the ram-disk.
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# Force root on ram-disk
-options 	MEMORY_DISK_SIZE=4096	# 2 Megabytes
+options 	MEMORY_DISK_ROOT_SIZE=4096	# 2 Megabytes
 
 maxusers	8
 
diff --git a/sys/arch/sandpoint/conf/INSTALL b/sys/arch/sandpoint/conf/INSTALL
index 20e5d03b8aee..192d0131b02b 100644
--- a/sys/arch/sandpoint/conf/INSTALL
+++ b/sys/arch/sandpoint/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.3 2002/03/10 19:56:45 lukem Exp $
+#	$NetBSD: INSTALL,v 1.4 2002/04/02 05:30:48 lukem Exp $
 #
 # GENERIC for Motorola Sandpoint
 #
@@ -7,7 +7,7 @@ include "arch/sandpoint/conf/GENERIC"
 
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# Force root on RAM disk
-options 	MEMORY_DISK_SIZE=4096	# 2 MB
+options 	MEMORY_DISK_ROOT_SIZE=4096	# 2 MB
 
 pseudo-device	md		1
 
diff --git a/sys/arch/sandpoint/conf/RAMDISK b/sys/arch/sandpoint/conf/RAMDISK
index 8753978fae84..e2e047557ea9 100644
--- a/sys/arch/sandpoint/conf/RAMDISK
+++ b/sys/arch/sandpoint/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$NetBSD: RAMDISK,v 1.2 2002/03/10 19:56:46 lukem Exp $
+#	$NetBSD: RAMDISK,v 1.3 2002/04/02 05:30:48 lukem Exp $
 #
 # GENERIC for Motorola Sandpoint
 #
@@ -7,6 +7,6 @@ include "arch/sandpoint/conf/GENERIC"
 
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# Force root on RAM disk
-options 	MEMORY_DISK_SIZE=4096	# 2 MB
+options 	MEMORY_DISK_ROOT_SIZE=4096	# 2 MB
 
 pseudo-device	md		1
diff --git a/sys/arch/sgimips/conf/INDY b/sys/arch/sgimips/conf/INDY
index 818c8c5fd3dc..68508ac7a027 100644
--- a/sys/arch/sgimips/conf/INDY
+++ b/sys/arch/sgimips/conf/INDY
@@ -1,4 +1,4 @@
-#	$NetBSD: INDY,v 1.12 2002/03/10 19:56:46 lukem Exp $
+#	$NetBSD: INDY,v 1.13 2002/04/02 05:30:48 lukem Exp $
 
 include		"arch/sgimips/conf/std.sgimips"
 
@@ -29,7 +29,7 @@ options 	MIPS3_5200		# XXX
 #options 	MEMORY_DISK_HOOKS
 #options 	MEMORY_DISK_IS_ROOT
 #options 	MEMORY_DISK_SERVER=0
-#options 	MEMORY_DISK_SIZE=8192
+#options 	MEMORY_DISK_ROOT_SIZE=8192
 
 options 	KTRACE
 #options	PIPE_SOCKETPAIR		# smaller, but slower pipe(2)
diff --git a/sys/arch/shark/conf/GENERIC b/sys/arch/shark/conf/GENERIC
index 59c6f7c52558..27e6bd54668e 100644
--- a/sys/arch/shark/conf/GENERIC
+++ b/sys/arch/shark/conf/GENERIC
@@ -1,11 +1,11 @@
-#	$NetBSD: GENERIC,v 1.2 2002/03/10 19:56:46 lukem Exp $
+#	$NetBSD: GENERIC,v 1.3 2002/04/02 05:30:49 lukem Exp $
 #
 # Generic Shark configuration.
 #
 
 include	"arch/shark/conf/std.shark"
 
-#ident		"GENERIC-$Revision: 1.2 $"
+#ident		"GENERIC-$Revision: 1.3 $"
 
 # estimated number of users
 maxusers	32
@@ -108,7 +108,7 @@ options 	SYSVSHM		# System V-like memory sharing
 # Device options
 
 options 	MEMORY_DISK_HOOKS	# boottime setup of ramdisk
-#options 	MEMORY_DISK_SIZE=3400	# Size in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=3400	# Size in blocks
 #options 	MEMORY_DISK_IS_ROOT	# use memory disk as root
 
 options 	XSERVER			# also need INSECURE for now
diff --git a/sys/arch/shark/conf/INSTALL b/sys/arch/shark/conf/INSTALL
index 6c5fd9622b70..690f1b62cf0b 100644
--- a/sys/arch/shark/conf/INSTALL
+++ b/sys/arch/shark/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.3 2002/03/10 19:56:46 lukem Exp $
+#	$NetBSD: INSTALL,v 1.4 2002/04/02 05:30:49 lukem Exp $
 #
 #	Shark installation kernel
 #
@@ -101,7 +101,7 @@ options 	NFS_BOOT_DHCP	# use NetBSD standard DHCP/NFS boot code
 
 options 	MEMORY_DISK_HOOKS	# boottime setup of ramdisk
 options 	MEMORY_DISK_IS_ROOT	# use memory disk as root
-options 	MEMORY_DISK_SIZE=7000	# Size in blocks (3.5MB)
+options 	MEMORY_DISK_ROOT_SIZE=7000	# Size in blocks (3.5MB)
 
 options 	XSERVER			# also need INSECURE for now
 options 	INSECURE		# disable kernel securelevel
diff --git a/sys/arch/shark/conf/OFWGENCFG b/sys/arch/shark/conf/OFWGENCFG
index b87fab540355..4c3273d1c7be 100644
--- a/sys/arch/shark/conf/OFWGENCFG
+++ b/sys/arch/shark/conf/OFWGENCFG
@@ -1,4 +1,4 @@
-#	$NetBSD: OFWGENCFG,v 1.1 2002/02/10 01:57:02 thorpej Exp $
+#	$NetBSD: OFWGENCFG,v 1.2 2002/04/02 05:30:49 lukem Exp $
 #
 #	OFWGENCFG: 'generic' configuration for Open Firmware boards.
 #
@@ -89,7 +89,7 @@ options 	SHMMAXPGS=1024	# 1024 pages is the default
 # Device options
 
 #options 	MEMORY_DISK_HOOKS	# boottime setup of ramdisk
-#options 	MEMORY_DISK_SIZE=0	# Size in KBytes
+#options 	MEMORY_DISK_ROOT_SIZE=0	# Size in KBytes
 
 # Miscellaneous kernel options
 options 	KTRACE		# system call tracing, a la ktrace(1)
diff --git a/sys/arch/sparc/conf/INSTALL b/sys/arch/sparc/conf/INSTALL
index aad0265fe504..f755ec13c8f1 100644
--- a/sys/arch/sparc/conf/INSTALL
+++ b/sys/arch/sparc/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.31 2002/03/10 19:56:46 lukem Exp $
+#	$NetBSD: INSTALL,v 1.32 2002/04/02 05:30:49 lukem Exp $
 #
 # from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp
 #
@@ -17,7 +17,7 @@ options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
 ## The miniroot size must be kept in sync manually with the size of
 ## the `ramdisk' image (which is built in distrib/sparc/ramdisk).
-options 	MEMORY_DISK_SIZE=1360	# size of memory disk, in blocks
+options 	MEMORY_DISK_ROOT_SIZE=1360	# size of memory disk, in blocks
 
 pseudo-device	md		1	# memory disk device (ramdisk)
 
diff --git a/sys/arch/sparc64/conf/INSTALL b/sys/arch/sparc64/conf/INSTALL
index 271d2e9afd9a..8e44dd1065e6 100644
--- a/sys/arch/sparc64/conf/INSTALL
+++ b/sys/arch/sparc64/conf/INSTALL
@@ -1,8 +1,8 @@
-# 	$NetBSD: INSTALL,v 1.8 2002/03/10 19:56:46 lukem Exp $
+# 	$NetBSD: INSTALL,v 1.9 2002/04/02 05:30:49 lukem Exp $
 
 include "arch/sparc64/conf/GENERIC32"
 
-#ident 		"INSTALL-$Revision: 1.8 $"
+#ident 		"INSTALL-$Revision: 1.9 $"
 
 include "arch/sparc64/conf/std.sparc64-64"
 
@@ -27,4 +27,4 @@ options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
 ## The miniroot size must be kept in sync manually with the size of
 ## the `miniroot' image (which is built in distrib/sparc64/miniroot).
-options 	MEMORY_DISK_SIZE=10240	# size of memory disk, in blocks
+options 	MEMORY_DISK_ROOT_SIZE=10240	# size of memory disk, in blocks
diff --git a/sys/arch/sun2/conf/RAMDISK b/sys/arch/sun2/conf/RAMDISK
index 1f2f14b941e3..8cc6425ab4a7 100644
--- a/sys/arch/sun2/conf/RAMDISK
+++ b/sys/arch/sun2/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $NetBSD: RAMDISK,v 1.11 2002/03/10 19:56:47 lukem Exp $
+# $NetBSD: RAMDISK,v 1.12 2002/04/02 05:30:50 lukem Exp $
 
 # RAMDISK: Root/swap on ramdisk
 # This kernel is used to:
@@ -91,7 +91,7 @@ options 	INET		# IP prototol stack support
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=800	# size of memory disk, in blocks
+options 	MEMORY_DISK_ROOT_SIZE=800	# size of memory disk, in blocks
 
 config		netbsd root on ? type ffs
 
diff --git a/sys/arch/sun3/conf/RAMDISK b/sys/arch/sun3/conf/RAMDISK
index 0e78ab95418f..e81af6b1aac7 100644
--- a/sys/arch/sun3/conf/RAMDISK
+++ b/sys/arch/sun3/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$NetBSD: RAMDISK,v 1.31 2002/03/10 19:56:47 lukem Exp $
+#	$NetBSD: RAMDISK,v 1.32 2002/04/02 05:30:50 lukem Exp $
 
 # RAMDISK: Root/swap on ramdisk
 # This kernel is used to:
@@ -37,7 +37,7 @@ options 	INET		# IP prototol stack support
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=800	# size of memory disk, in blocks
+options 	MEMORY_DISK_ROOT_SIZE=800	# size of memory disk, in blocks
 
 options		PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
 
diff --git a/sys/arch/sun3/conf/RAMDISK3X b/sys/arch/sun3/conf/RAMDISK3X
index 7793f7d267f3..383dde1f8f19 100644
--- a/sys/arch/sun3/conf/RAMDISK3X
+++ b/sys/arch/sun3/conf/RAMDISK3X
@@ -1,4 +1,4 @@
-# $NetBSD: RAMDISK3X,v 1.18 2002/03/10 19:56:47 lukem Exp $
+# $NetBSD: RAMDISK3X,v 1.19 2002/04/02 05:30:50 lukem Exp $
 
 # RAMDISK: Root/swap on ramdisk
 # This kernel is used to:
@@ -37,7 +37,7 @@ options 	INET		# IP prototol stack support
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=800	# size of memory disk, in blocks
+options 	MEMORY_DISK_ROOT_SIZE=800	# size of memory disk, in blocks
 
 options		PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
 
diff --git a/sys/arch/vax/conf/INSTALL b/sys/arch/vax/conf/INSTALL
index 1cf3a27f2684..f1a9acb6e3d2 100644
--- a/sys/arch/vax/conf/INSTALL
+++ b/sys/arch/vax/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.23 2002/03/29 06:37:53 matt Exp $
+#	$NetBSD: INSTALL,v 1.24 2002/04/02 05:30:50 lukem Exp $
 #
 # INSTALL kernel; all supported devices but nothing fancy.
 #
@@ -31,7 +31,7 @@ maxusers	8
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_SIZE=3072	# size of memory disk, in blocks
+options 	MEMORY_DISK_ROOT_SIZE=3072	# size of memory disk, in blocks
 
 
 # Kernel compiled-in symbolic debugger & system call tracer
diff --git a/sys/arch/walnut/conf/WALNUT b/sys/arch/walnut/conf/WALNUT
index db85bdc3d755..a17831f05955 100644
--- a/sys/arch/walnut/conf/WALNUT
+++ b/sys/arch/walnut/conf/WALNUT
@@ -1,4 +1,4 @@
-#	$NetBSD: WALNUT,v 1.13 2002/03/27 05:25:28 simonb Exp $
+#	$NetBSD: WALNUT,v 1.14 2002/04/02 05:30:50 lukem Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -16,8 +16,7 @@ maxusers	32
 #options 	MEMORY_DISK_HOOKS
 #options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 #options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-#options 	MEMORY_DISK_SIZE=16384	# size of memory disk, in blocks
-#options 	MEMORY_DISK_SIZE=1		# size of memory disk, in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=16384	# size of memory disk, in blocks
 
 
 #options 	UCONSOLE	# users can use TIOCCONS (for xconsole)
diff --git a/sys/arch/x68k/conf/INSTALL b/sys/arch/x68k/conf/INSTALL
index a860e807da31..30aea7a2f8f8 100644
--- a/sys/arch/x68k/conf/INSTALL
+++ b/sys/arch/x68k/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.48 2002/03/10 19:56:48 lukem Exp $
+#	$NetBSD: INSTALL,v 1.49 2002/04/02 05:30:51 lukem Exp $
 
 #
 #	INSTALL -- installation kernel.
@@ -6,7 +6,7 @@
 
 include "arch/x68k/conf/std.x68k"
 
-#ident 		"INSTALL-$Revision: 1.48 $"
+#ident 		"INSTALL-$Revision: 1.49 $"
 
 makeoptions	COPTS="-Os"		# Optimise for space. Implies -O2
 
@@ -16,9 +16,9 @@ maxusers	4
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# Force root on memory-disk
 options 	MEMORY_DISK_SERVER=0	# No user space hooks
-#options 	MEMORY_DISK_SIZE=2400	# 1.2M, same as a 130mm floppy
-#options 	MEMORY_DISK_SIZE=2880	# 1.44M, same as a 90mm floppy
-options 	MEMORY_DISK_SIZE=2550
+#options 	MEMORY_DISK_ROOT_SIZE=2400	# 1.2M, same as a 130mm floppy
+#options 	MEMORY_DISK_ROOT_SIZE=2880	# 1.44M, same as a 90mm floppy
+options 	MEMORY_DISK_ROOT_SIZE=2550
 
 ## System kernel configuration.  See options(4) for more detail.
 
diff --git a/sys/arch/x86_64/conf/SIMICS b/sys/arch/x86_64/conf/SIMICS
index be17a0bbe4d4..a061c88806fa 100644
--- a/sys/arch/x86_64/conf/SIMICS
+++ b/sys/arch/x86_64/conf/SIMICS
@@ -1,4 +1,4 @@
-#	$NetBSD: SIMICS,v 1.7 2002/03/10 19:56:48 lukem Exp $
+#	$NetBSD: SIMICS,v 1.8 2002/04/02 05:30:51 lukem Exp $
 #
 #	INSTALL_TINY - Tiny Installation kernel, suitable for 4M machines.
 #
@@ -18,8 +18,8 @@ makeoptions	COPTS="-Os"
 #options 	MEMORY_DISK_HOOKS
 #options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 #options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-#options 	MEMORY_DISK_SIZE=8192	# size of memory disk, in blocks
-#options 	MEMORY_DISK_SIZE=2880	# 1.44M, same as a floppy
+#options 	MEMORY_DISK_ROOT_SIZE=8192	# size of memory disk, in blocks
+#options 	MEMORY_DISK_ROOT_SIZE=2880	# 1.44M, same as a floppy
 
 maxusers	2		# estimated number of users
 
diff --git a/sys/arch/x86_64/x86_64/md_root.c b/sys/arch/x86_64/x86_64/md_root.c
index 9adcc1c51b3e..8412595b85b1 100644
--- a/sys/arch/x86_64/x86_64/md_root.c
+++ b/sys/arch/x86_64/x86_64/md_root.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md_root.c,v 1.2 2002/03/10 19:56:48 lukem Exp $	*/
+/*	$NetBSD: md_root.c,v 1.3 2002/04/02 05:30:51 lukem Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -37,11 +37,11 @@
 
 extern int boothowto;
 
-#ifndef MEMORY_DISK_SIZE
-#define MEMORY_DISK_SIZE 512
+#ifndef MEMORY_DISK_ROOT_SIZE
+#define MEMORY_DISK_ROOT_SIZE 512
 #endif
 
-#define ROOTBYTES (MEMORY_DISK_SIZE << DEV_BSHIFT)
+#define ROOTBYTES (MEMORY_DISK_ROOT_SIZE << DEV_BSHIFT)
 
 /*
  * This array will be patched to contain a file-system image.
diff --git a/sys/conf/files b/sys/conf/files
index e69942b84013..0090b851cb8b 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.508 2002/03/30 20:21:21 uwe Exp $
+#	$NetBSD: files,v 1.509 2002/04/02 05:30:52 lukem Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
@@ -181,7 +181,7 @@ defflag				SYSCALL_DEBUG
 #
 defflag	opt_md.h		MEMORY_DISK_HOOKS MEMORY_DISK_IS_ROOT
 				MEMORY_DISK_DYNAMIC
-defparam opt_md.h		MEMORY_DISK_SERVER MEMORY_DISK_SIZE
+defparam opt_md.h		MEMORY_DISK_SERVER MEMORY_DISK_ROOT_SIZE
 
 # device classes
 #
diff --git a/sys/dev/md_root.c b/sys/dev/md_root.c
index 9b0aaa7a6c16..9620386f66b0 100644
--- a/sys/dev/md_root.c
+++ b/sys/dev/md_root.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md_root.c,v 1.5 2002/03/10 19:56:49 lukem Exp $	*/
+/*	$NetBSD: md_root.c,v 1.6 2002/04/02 05:30:52 lukem Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: md_root.c,v 1.5 2002/03/10 19:56:49 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md_root.c,v 1.6 2002/04/02 05:30:52 lukem Exp $");
 
 #include "opt_md.h"
 
@@ -54,10 +54,10 @@ size_t md_root_size;
 char *md_root_image;
 #else /* MEMORY_DISK_DYNAMIC */
 
-#ifndef MEMORY_DISK_SIZE
-#define MEMORY_DISK_SIZE 512
+#ifndef MEMORY_DISK_ROOT_SIZE
+#define MEMORY_DISK_ROOT_SIZE 512
 #endif
-#define ROOTBYTES (MEMORY_DISK_SIZE << DEV_BSHIFT)
+#define ROOTBYTES (MEMORY_DISK_ROOT_SIZE << DEV_BSHIFT)
 
 /*
  * This array will be patched to contain a file-system image.