[src/netbsd-6]: src/sys/arch/x86/x86 Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/8546e8655abe
branches:  netbsd-6
changeset: 776492:8546e8655abe
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Nov 07 20:35:16 2013 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #977):
        sys/arch/x86/x86/x86_autoconf.c: revision 1.67
If we have both wedge and partition info, use the partition info in the
wedge case too. From mlelstv.
XXX: pullup-6

diffstat:

 sys/arch/x86/x86/x86_autoconf.c |  13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r b3be4af3bb36 -r 8546e8655abe sys/arch/x86/x86/x86_autoconf.c
--- a/sys/arch/x86/x86/x86_autoconf.c   Thu Nov 07 20:23:46 2013 +0000
+++ b/sys/arch/x86/x86/x86_autoconf.c   Thu Nov 07 20:35:16 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: x86_autoconf.c,v 1.62.8.3 2012/08/08 15:51:08 martin Exp $     */
+/*     $NetBSD: x86_autoconf.c,v 1.62.8.4 2013/11/07 20:35:16 snj Exp $        */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.62.8.3 2012/08/08 15:51:08 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.62.8.4 2013/11/07 20:35:16 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -346,7 +346,10 @@
                        return;
        }
 
-       if ((biw = lookup_bootinfo(BTINFO_BOOTWEDGE)) != NULL) {
+       bid = lookup_bootinfo(BTINFO_BOOTDISK);
+       biw = lookup_bootinfo(BTINFO_BOOTWEDGE);
+
+       if (biw != NULL) {
                /*
                 * Scan all disk devices for ones that match the passed data.
                 * Don't break if one is found, to get possible multiple
@@ -382,7 +385,7 @@
                                continue;
                        }
                        booted_device = dv;
-                       booted_partition = 0;
+                       booted_partition = bid != NULL ? bid->partition : 0;
                        booted_nblks = biw->nblks;
                        booted_startblk = biw->startblk;
                }
@@ -392,7 +395,7 @@
                        return;
        }
 
-       if ((bid = lookup_bootinfo(BTINFO_BOOTDISK)) != NULL) {
+       if (bid != NULL) {
                /*
                 * Scan all disk devices for ones that match the passed data.
                 * Don't break if one is found, to get possible multiple