[src/trunk]: src/sys/arch/x86/x86 md_root_setconf also depends on option MEMO...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9b7c6252351b
branches:  trunk
changeset: 789667:9b7c6252351b
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Aug 31 12:26:56 2013 +0000

description:
md_root_setconf also depends on option MEMORY_DISK_DYNAMIC

diffstat:

 sys/arch/x86/x86/x86_machdep.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 5b48f894b803 -r 9b7c6252351b sys/arch/x86/x86/x86_machdep.c
--- a/sys/arch/x86/x86/x86_machdep.c    Sat Aug 31 10:42:18 2013 +0000
+++ b/sys/arch/x86/x86/x86_machdep.c    Sat Aug 31 12:26:56 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: x86_machdep.c,v 1.59 2013/08/30 16:42:17 jmcneill Exp $        */
+/*     $NetBSD: x86_machdep.c,v 1.60 2013/08/31 12:26:56 jmcneill Exp $        */
 
 /*-
  * Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.59 2013/08/30 16:42:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.60 2013/08/31 12:26:56 jmcneill Exp $");
 
 #include "opt_modular.h"
 #include "opt_physmem.h"
@@ -74,7 +74,7 @@
 #endif
 
 #include "opt_md.h"
-#ifdef MEMORY_DISK_HOOKS
+#if defined(MEMORY_DISK_HOOKS) && defined(MEMORY_DISK_DYNAMIC)
 #include <dev/md.h>
 #endif
 
@@ -191,7 +191,7 @@
                        aprint_debug("File-system image path=%s len=%d pa=%x\n",
                            bi->path, bi->len, bi->base);
                        KASSERT(trunc_page(bi->base) == bi->base);
-#ifdef MEMORY_DISK_HOOKS
+#if defined(MEMORY_DISK_HOOKS) && defined(MEMORY_DISK_DYNAMIC)
                        md_root_setconf((void *)((uintptr_t)bi->base + KERNBASE),
                            bi->len);
 #endif