[src/netbsd-7]: src/sys/arch/evbmips/loongson Pull up following revision(s) (...

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

details:   https://anonhg.NetBSD.org/src/rev/d51e1127d9c9
branches:  netbsd-7
changeset: 798811:d51e1127d9c9
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Jan 10 16:46:56 2015 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #399):
        sys/arch/evbmips/loongson/autoconf.c: revision 1.6
if MEMORY_DISK_IS_ROOT is defined, dont try to guess the root device

diffstat:

 sys/arch/evbmips/loongson/autoconf.c |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (57 lines):

diff -r 9def8dd6c260 -r d51e1127d9c9 sys/arch/evbmips/loongson/autoconf.c
--- a/sys/arch/evbmips/loongson/autoconf.c      Fri Jan 09 14:51:50 2015 +0000
+++ b/sys/arch/evbmips/loongson/autoconf.c      Sat Jan 10 16:46:56 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.5 2013/03/13 21:17:43 macallan Exp $    */
+/*     $NetBSD: autoconf.c,v 1.5.12.1 2015/01/10 16:46:56 martin Exp $ */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -35,8 +35,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "opt_md.h"
+
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.5 2013/03/13 21:17:43 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.5.12.1 2015/01/10 16:46:56 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -46,7 +48,9 @@
 #include <sys/cpu.h>
 #include <evbmips/loongson/autoconf.h>
 
+#ifndef MEMORY_DISK_IS_ROOT
 static void    findroot(void);
+#endif
 
 enum devclass bootdev_class = DV_DULL;
 char          bootdev[16];
@@ -74,7 +78,9 @@
 void
 cpu_rootconf(void)
 {
+#ifndef MEMORY_DISK_IS_ROOT
        findroot();
+#endif
 
        printf("boot device: %s\n",
                booted_device ? device_xname(booted_device) : "<unknown>");
@@ -85,6 +91,7 @@
 extern char    bootstring[];
 extern int     netboot;
 
+#ifndef MEMORY_DISK_IS_ROOT
 static void
 findroot(void)
 {
@@ -111,6 +118,7 @@
 
        return;
 }
+#endif
 
 void
 device_register(device_t dev, void *aux)