From c9d036d7965cfd95c0c3d078c7af039da06e3c3c Mon Sep 17 00:00:00 2001
From: jonathan <jonathan@NetBSD.org>
Date: Sun, 7 Feb 1999 09:34:58 +0000
Subject: [PATCH] defopt MEMORY_DISK_{HOOKS,SERVER,IS_ROOT}.

---
 sys/arch/arm32/arm32/autoconf.c        | 4 +++-
 sys/arch/arm32/arm32/machdep.c         | 3 ++-
 sys/arch/arm32/dev/md_hooks.c          | 4 +++-
 sys/arch/arm32/rc7500/rc7500_machdep.c | 3 ++-
 sys/arch/sparc/dev/fd.c                | 3 ++-
 sys/arch/sparc64/dev/fd.c              | 3 ++-
 sys/conf/files                         | 5 ++++-
 sys/dev/md.c                           | 3 ++-
 sys/kern/kern_subr.c                   | 3 ++-
 9 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/sys/arch/arm32/arm32/autoconf.c b/sys/arch/arm32/arm32/autoconf.c
index b6792420c9f6..58c6b3a0706b 100644
--- a/sys/arch/arm32/arm32/autoconf.c
+++ b/sys/arch/arm32/arm32/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.28 1999/01/03 20:13:45 mark Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.29 1999/02/07 09:34:58 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,6 +42,8 @@
  * Created      : 08/10/94
  */
 
+#include "opt_md.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/reboot.h>
diff --git a/sys/arch/arm32/arm32/machdep.c b/sys/arch/arm32/arm32/machdep.c
index b42343795264..022a3105b1c4 100644
--- a/sys/arch/arm32/arm32/machdep.c
+++ b/sys/arch/arm32/arm32/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.57 1999/01/09 22:10:16 thorpej Exp $	*/
+/*	$NetBSD: machdep.c,v 1.58 1999/02/07 09:34:58 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -41,6 +41,7 @@
  */
 
 #include "opt_compat_netbsd.h"
+#include "opt_md.h"
 #include "opt_pmap_debug.h"
 #include "opt_uvm.h"
 #include "opt_sysv.h"
diff --git a/sys/arch/arm32/dev/md_hooks.c b/sys/arch/arm32/dev/md_hooks.c
index a4773ca0c4ca..2b1c2b4b1484 100644
--- a/sys/arch/arm32/dev/md_hooks.c
+++ b/sys/arch/arm32/dev/md_hooks.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md_hooks.c,v 1.11 1998/06/02 20:41:53 mark Exp $	*/
+/*	$NetBSD: md_hooks.c,v 1.12 1999/02/07 09:34:59 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -27,7 +27,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "opt_md.h"
 #include "opt_uvm.h"
+
 #include <sys/param.h>
 #include <sys/reboot.h>
 #include <sys/device.h>
diff --git a/sys/arch/arm32/rc7500/rc7500_machdep.c b/sys/arch/arm32/rc7500/rc7500_machdep.c
index 8175f6d1b122..d5ed40de8679 100644
--- a/sys/arch/arm32/rc7500/rc7500_machdep.c
+++ b/sys/arch/arm32/rc7500/rc7500_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rc7500_machdep.c,v 1.21 1999/01/03 02:23:27 mark Exp $	*/
+/*	$NetBSD: rc7500_machdep.c,v 1.22 1999/02/07 09:34:59 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -46,6 +46,7 @@
  */
 
 #include "opt_ddb.h"
+#include "opt_md.h"
 #include "opt_pmap_debug.h"
 
 #include <sys/param.h>
diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c
index c4df8c7a64a5..35e30411e9b2 100644
--- a/sys/arch/sparc/dev/fd.c
+++ b/sys/arch/sparc/dev/fd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fd.c,v 1.64 1998/08/15 03:02:43 mycroft Exp $	*/
+/*	$NetBSD: fd.c,v 1.65 1999/02/07 09:34:58 jonathan Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994, 1995 Charles M. Hannum.
@@ -41,6 +41,7 @@
  */
 
 #include "opt_ddb.h"
+#include "opt_md.h"
 #include "opt_uvm.h"
 
 #include <sys/param.h>
diff --git a/sys/arch/sparc64/dev/fd.c b/sys/arch/sparc64/dev/fd.c
index 242c24ea46b5..1cc3c23ddce8 100644
--- a/sys/arch/sparc64/dev/fd.c
+++ b/sys/arch/sparc64/dev/fd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fd.c,v 1.3 1998/08/15 03:02:43 mycroft Exp $	*/
+/*	$NetBSD: fd.c,v 1.4 1999/02/07 09:34:59 jonathan Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994, 1995 Charles M. Hannum.
@@ -41,6 +41,7 @@
  */
 
 #include "opt_ddb.h"
+#include "opt_md.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/conf/files b/sys/conf/files
index d633609c9579..9c71baf497a9 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.270 1999/01/26 17:14:11 christos Exp $
+#	$NetBSD: files,v 1.271 1999/02/07 09:34:58 jonathan Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
@@ -101,6 +101,9 @@ defopt	opt_mbr.h	COMPAT_386BSD_MBRPART BIOS_VERBOSE
 defopt	DDB
 defopt	opt_ddbparam.h	DDB_FROMCONSOLE DDB_ONPANIC DDB_HISTORY_SIZE
 
+# memory (ram) disk options
+defopt	opt_md.h	MEMORY_DISK_HOOKS MEMORY_DISK_SERVER MEMORY_DISK_IS_ROOT
+
 # device classes
 devclass disk
 devclass tape
diff --git a/sys/dev/md.c b/sys/dev/md.c
index f82819f48db2..7e67ba5b1226 100644
--- a/sys/dev/md.c
+++ b/sys/dev/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.18 1998/09/01 06:13:33 enami Exp $	*/
+/*	$NetBSD: md.c,v 1.19 1999/02/07 09:34:59 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross, Leo Weppelman.
@@ -45,6 +45,7 @@
  * to the authors of the MFS implementation.
  */
 
+#include "opt_md.h"
 #include "opt_uvm.h"
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index 6a39aa58b044..8569eccf8a04 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_subr.c,v 1.42 1999/01/22 07:57:13 chs Exp $	*/
+/*	$NetBSD: kern_subr.c,v 1.43 1999/02/07 09:34:59 jonathan Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -89,6 +89,7 @@
  *	@(#)kern_subr.c	8.4 (Berkeley) 2/14/95
  */
 
+#include "opt_md.h"
 #include "opt_uvm.h"
 
 #include <sys/param.h>