[src/trunk]: src/sys/arch/x86/x86 PR/38356: Minoura Makoto: Use the device's ...

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

details:   https://anonhg.NetBSD.org/src/rev/14ad2031f50d
branches:  trunk
changeset: 769698:14ad2031f50d
user:      gsutre <gsutre%NetBSD.org@localhost>
date:      Mon Sep 19 10:03:32 2011 +0000

description:
PR/38356: Minoura Makoto: Use the device's unit (instead of autoconf's)
to match the bootinfo root device.

Fixes multiboot(8) root= option as well as GRUB knetbsd --root option.

diffstat:

 sys/arch/x86/x86/x86_autoconf.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r ab60a29f1268 -r 14ad2031f50d sys/arch/x86/x86/x86_autoconf.c
--- a/sys/arch/x86/x86/x86_autoconf.c   Mon Sep 19 08:53:30 2011 +0000
+++ b/sys/arch/x86/x86/x86_autoconf.c   Mon Sep 19 10:03:32 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: x86_autoconf.c,v 1.60 2011/07/02 13:09:31 mrg Exp $    */
+/*     $NetBSD: x86_autoconf.c,v 1.61 2011/09/19 10:03:32 gsutre 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.60 2011/07/02 13:09:31 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.61 2011/09/19 10:03:32 gsutre Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -442,7 +442,7 @@
                        len = strlen(cd->cf_name);
 
                        if (strncmp(cd->cf_name, biv->devname, len) == 0 &&
-                           biv->devname[len] - '0' == cd->cf_unit) {
+                           biv->devname[len] - '0' == device_unit(dv)) {
                                handle_wedges(dv, biv->devname[len + 1] - 'a');
                                break;
                        }