[src/netbsd-3]: src/sys/dev/ata Pull up following revision(s) (requested by a...

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

details:   https://anonhg.NetBSD.org/src/rev/d9a1d5c4b594
branches:  netbsd-3
changeset: 577781:d9a1d5c4b594
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Jan 27 22:53:45 2006 +0000

description:
Pull up following revision(s) (requested by abs in ticket #1132):
        sys/dev/ata/wd.c: revision 1.318
cast 16bit atap_capacity to u_int64_t before << 16. (assigned to
a u_int64_t variable). Fixes 1 to 2 TB disks in qemu. Tested with
1=0000GB and to a lesser extent 2047GB sparse files. For reference
an empty FFS1 filesystem on a 1200GB sparse file uses 19GB of disk.

diffstat:

 sys/dev/ata/wd.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 4b84e0e16c3a -r d9a1d5c4b594 sys/dev/ata/wd.c
--- a/sys/dev/ata/wd.c  Fri Jan 27 22:51:11 2006 +0000
+++ b/sys/dev/ata/wd.c  Fri Jan 27 22:53:45 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wd.c,v 1.298.2.7 2005/09/08 21:18:34 tron Exp $ */
+/*     $NetBSD: wd.c,v 1.298.2.8 2006/01/27 22:53:45 tron Exp $ */
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.298.2.7 2005/09/08 21:18:34 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.298.2.8 2006/01/27 22:53:45 tron Exp $");
 
 #ifndef ATADEBUG
 #define ATADEBUG
@@ -368,7 +368,7 @@
        } else if ((wd->sc_flags & WDF_LBA) != 0) {
                aprint_normal(" LBA addressing\n");
                wd->sc_capacity =
-                   (wd->sc_params.atap_capacity[1] << 16) |
+                   ((u_int64_t)wd->sc_params.atap_capacity[1] << 16) |
                    wd->sc_params.atap_capacity[0];
        } else {
                aprint_normal(" chs addressing\n");