[src/trunk]: src/sys/arch/x86 Complete the dosparts -> mbrparts conversion. O...

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

details:   https://anonhg.NetBSD.org/src/rev/13f74e4da711
branches:  trunk
changeset: 786869:13f74e4da711
user:      christos <christos%NetBSD.org@localhost>
date:      Thu May 16 19:06:45 2013 +0000

description:
Complete the dosparts -> mbrparts conversion. Only x86k new uses dosparts
because it also uses struct dos_partition.

diffstat:

 sys/arch/x86/include/bootinfo.h |  2 +-
 sys/arch/x86/x86/x86_autoconf.c |  6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r b28865653b2d -r 13f74e4da711 sys/arch/x86/include/bootinfo.h
--- a/sys/arch/x86/include/bootinfo.h   Thu May 16 19:06:44 2013 +0000
+++ b/sys/arch/x86/include/bootinfo.h   Thu May 16 19:06:45 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bootinfo.h,v 1.21 2013/05/16 19:06:45 christos Exp $   */
+/*     $NetBSD: bootinfo.h,v 1.20 2013/05/16 19:06:45 christos Exp $   */
 
 /*
  * Copyright (c) 1997
diff -r b28865653b2d -r 13f74e4da711 sys/arch/x86/x86/x86_autoconf.c
--- a/sys/arch/x86/x86/x86_autoconf.c   Thu May 16 19:06:44 2013 +0000
+++ b/sys/arch/x86/x86/x86_autoconf.c   Thu May 16 19:06:45 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: x86_autoconf.c,v 1.67 2013/04/28 14:32:55 christos Exp $       */
+/*     $NetBSD: x86_autoconf.c,v 1.68 2013/05/16 19:06:45 christos 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.67 2013/04/28 14:32:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.68 2013/05/16 19:06:45 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -176,7 +176,7 @@
                                if (be->flags & BI_GEOM_INVALID)
                                        continue;
                                if (be->cksum == ck &&
-                                   memcmp(&mbr[MBR_PART_OFFSET], be->dosparts,
+                                   memcmp(&mbr[MBR_PART_OFFSET], be->mbrparts,
                                        MBR_PART_COUNT *
                                          sizeof(struct mbr_partition)) == 0) {
 #ifdef GEOM_DEBUG