diff options
| author |   krw <krw@openbsd.org> | 2013-10-20 10:11:16 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2013-10-20 10:11:16 +0000 |
| commit | 1c51b504ba3ec9c6f67a7b45acb8b0ffe5c411dc (patch) | |
| tree | 708e5384216cec2b8509b01cdccedfbcd4bffa06 /sys/arch/sparc | |
| parent | Provide more debugging aids when failing to read the packed image from disk (diff) | |
| download | wireguard-openbsd-1c51b504ba3ec9c6f67a7b45acb8b0ffe5c411dc.tar.xz wireguard-openbsd-1c51b504ba3ec9c6f67a7b45acb8b0ffe5c411dc.zip | |
(daddr_t) -> (u_int64_t) when multiplying ncylinders * secpercyl to
get disk size, since DL_SETDSIZE() takes disk sector values, not
512-byte block values.
Diffstat (limited to 'sys/arch/sparc')
| -rw-r--r-- | sys/arch/sparc/dev/xd.c | 4 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/xy.c | 4 | ||||
| -rw-r--r-- | sys/arch/sparc/sparc/disksubr.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/sparc/dev/xd.c b/sys/arch/sparc/dev/xd.c index f7dd8eba5ad..f16c7bce5e5 100644 --- a/sys/arch/sparc/dev/xd.c +++ b/sys/arch/sparc/dev/xd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xd.c,v 1.59 2013/10/14 23:26:22 krw Exp $ */ +/* $OpenBSD: xd.c,v 1.60 2013/10/20 10:11:16 krw Exp $ */ /* $NetBSD: xd.c,v 1.37 1997/07/29 09:58:16 fair Exp $ */ /* @@ -300,7 +300,7 @@ xdgetdisklabel(xd, b) lp->d_secsize = XDFM_BPS; if (sl->sl_magic == SUN_DKMAGIC) { lp->d_secpercyl = sl->sl_nsectors * sl->sl_ntracks; - DL_SETDSIZE(lp, (daddr_t)lp->d_secpercyl * sl->sl_ncylinders); + DL_SETDSIZE(lp, (u_int64_t)lp->d_secpercyl * sl->sl_ncylinders); } else { lp->d_secpercyl = 1; } diff --git a/sys/arch/sparc/dev/xy.c b/sys/arch/sparc/dev/xy.c index 561079a653e..ba0be46bd01 100644 --- a/sys/arch/sparc/dev/xy.c +++ b/sys/arch/sparc/dev/xy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xy.c,v 1.55 2013/10/14 23:26:22 krw Exp $ */ +/* $OpenBSD: xy.c,v 1.56 2013/10/20 10:11:16 krw Exp $ */ /* $NetBSD: xy.c,v 1.26 1997/07/19 21:43:56 pk Exp $ */ /* @@ -238,7 +238,7 @@ xygetdisklabel(xy, b) lp->d_secsize = XYFM_BPS; if (sl->sl_magic == SUN_DKMAGIC) { lp->d_secpercyl = sl->sl_nsectors * sl->sl_ntracks; - DL_SETDSIZE(lp, (daddr_t)lp->d_secpercyl * sl->sl_ncylinders); + DL_SETDSIZE(lp, (u_int64_t)lp->d_secpercyl * sl->sl_ncylinders); } else { lp->d_secpercyl = 1; } diff --git a/sys/arch/sparc/sparc/disksubr.c b/sys/arch/sparc/sparc/disksubr.c index e4e093f9eb6..05f1cea89fe 100644 --- a/sys/arch/sparc/sparc/disksubr.c +++ b/sys/arch/sparc/sparc/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.91 2013/06/11 16:42:11 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.92 2013/10/20 10:11:16 krw Exp $ */ /* $NetBSD: disksubr.c,v 1.16 1996/04/28 20:25:59 thorpej Exp $ */ /* @@ -263,7 +263,7 @@ disklabel_sun_to_bsd(struct sun_disklabel *sl, struct disklabel *lp) secpercyl = sl->sl_nsectors * sl->sl_ntracks; lp->d_secpercyl = secpercyl; if (DL_GETDSIZE(lp) == 0) - DL_SETDSIZE(lp, (daddr_t)secpercyl * sl->sl_ncylinders); + DL_SETDSIZE(lp, (u_int64_t)secpercyl * sl->sl_ncylinders); lp->d_version = 1; memcpy(&lp->d_uid, &sl->sl_uid, sizeof(sl->sl_uid)); |