Module Name: src
Committed By: jmcneill
Date: Sat Aug 31 12:26:56 UTC 2013
Modified Files:
src/sys/arch/x86/x86: x86_machdep.c
Log Message:
md_root_setconf also depends on option MEMORY_DISK_DYNAMIC
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/x86/x86/x86_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/x86/x86/x86_machdep.c
diff -u src/sys/arch/x86/x86/x86_machdep.c:1.59 src/sys/arch/x86/x86/x86_machdep.c:1.60
--- src/sys/arch/x86/x86/x86_machdep.c:1.59 Fri Aug 30 16:42:17 2013
+++ src/sys/arch/x86/x86/x86_machdep.c Sat Aug 31 12:26:56 2013
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: x86_machdep.
#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 @@ module_init_md(void)
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
