[src/netbsd-6]: src/sys/arch/i386/stand/lib Pull up following revision(s) (re...

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

details:   https://anonhg.NetBSD.org/src/rev/e1d1e1bacabb
branches:  netbsd-6
changeset: 774349:e1d1e1bacabb
user:      riz <riz%NetBSD.org@localhost>
date:      Sat Jul 21 00:03:19 2012 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #432):
        sys/arch/i386/stand/lib/biosdisk.c: revision 1.42
Apply patch:
 PR/46583: BIOS bootloader problems with partitions that start above 1TB
Should be pulled up to netbsd-6.

diffstat:

 sys/arch/i386/stand/lib/biosdisk.c |  13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (50 lines):

diff -r 23ca8a7cd6d4 -r e1d1e1bacabb sys/arch/i386/stand/lib/biosdisk.c
--- a/sys/arch/i386/stand/lib/biosdisk.c        Sat Jul 21 00:01:45 2012 +0000
+++ b/sys/arch/i386/stand/lib/biosdisk.c        Sat Jul 21 00:03:19 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: biosdisk.c,v 1.40.2.1 2012/06/24 16:17:40 jdc Exp $    */
+/*     $NetBSD: biosdisk.c,v 1.40.2.2 2012/07/21 00:03:19 riz Exp $    */
 
 /*
  * Copyright (c) 1996, 1998
@@ -416,7 +416,7 @@
 
        if (readsects(&d->ll, sector, 1, d->buf, 0)) {
 #ifdef DISK_DEBUG
-               printf("Error reading MFS sector %d\n", sector);
+               printf("Error reading MFS sector %"PRId64"\n", sector);
 #endif
                return EIO;
        }
@@ -445,10 +445,11 @@
        struct disklabel dflt_lbl;
        struct mbr_partition mbr[MBR_PART_COUNT];
        struct partition *p;
-       int sector, i;
+       uint32_t sector;
+       int i;
        int error;
        int typ;
-       int ext_base, this_ext, next_ext;
+       uint32_t ext_base, this_ext, next_ext;
 #ifdef COMPAT_386BSD_MBRPART
        int sector_386bsd = -1;
 #endif
@@ -473,7 +474,7 @@
                next_ext = 0;
                if (readsects(&d->ll, this_ext, 1, d->buf, 0)) {
 #ifdef DISK_DEBUG
-                       printf("error reading MBR sector %d\n", this_ext);
+                       printf("error reading MBR sector %u\n", this_ext);
 #endif
                        return EIO;
                }
@@ -486,7 +487,7 @@
                                continue;
                        sector = this_ext + mbr[i].mbrp_start;
 #ifdef DISK_DEBUG
-                       printf("ptn type %d in sector %d\n", typ, sector);
+                       printf("ptn type %d in sector %u\n", typ, sector);
 #endif
                         if (typ == MBR_PTYPE_MINIX_14B) {
                                if (!read_minix_subp(d, &dflt_lbl,