summaryrefslogtreecommitdiff
path: root/sys/dev/md_root.c
diff options
context:
space:
mode:
authorbriggs <briggs@NetBSD.org>2003-02-05 15:20:29 +0000
committerbriggs <briggs@NetBSD.org>2003-02-05 15:20:29 +0000
commit6d78dc7cfc778ec863154d0df76edfd94ece06be (patch)
treecc36269026660a48a8738d55207102fc696b2c3a /sys/dev/md_root.c
parente3e4805068442d222dac0dffca33f7849a254163 (diff)
Ensure that MEMORY_RBFLAGS is defined whether or not MEMORY_DISK_DYNAMIC.
Diffstat (limited to 'sys/dev/md_root.c')
-rw-r--r--sys/dev/md_root.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/md_root.c b/sys/dev/md_root.c
index 723d6c5fa02..de08bc2bcaa 100644
--- a/sys/dev/md_root.c
+++ b/sys/dev/md_root.c
@@ -1,4 +1,4 @@
-/* $NetBSD: md_root.c,v 1.7 2003/02/03 23:02:43 matt Exp $ */
+/* $NetBSD: md_root.c,v 1.8 2003/02/05 15:20:29 briggs 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.7 2003/02/03 23:02:43 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md_root.c,v 1.8 2003/02/05 15:20:29 briggs Exp $");
#include "opt_md.h"
@@ -59,10 +59,6 @@ char *md_root_image;
#endif
#define ROOTBYTES (MEMORY_DISK_ROOT_SIZE << DEV_BSHIFT)
-#ifndef MEMORY_RBFLAGS
-#define MEMORY_RBFLAGS RB_SINGLE /* force single user */
-#endif
-
/*
* This array will be patched to contain a file-system image.
* See the program mdsetimage(8) for details.
@@ -71,6 +67,10 @@ u_int32_t md_root_size = ROOTBYTES;
char md_root_image[ROOTBYTES] = "|This is the root ramdisk!\n";
#endif /* MEMORY_DISK_DYNAMIC */
+#ifndef MEMORY_RBFLAGS
+#define MEMORY_RBFLAGS RB_SINGLE /* force single user */
+#endif
+
#ifdef MEMORY_DISK_DYNAMIC
void
md_root_setconf(char *addr, size_t size)