diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-06 17:15:15 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-06 17:15:15 +0000 |
| commit | 64b0758a0244e515108eec4f2cd5d05a5939ebf1 (patch) | |
| tree | e5e991586e626374ede95d07956bcaf6a47372be /sys/arch/amd64 | |
| parent | a0f03208acbc7a85466c7cf68058959c1bbe9668 (diff) | |
now that all partition size/offsets are potentially 64-bit, change the
type of all variables to daddr64_t. this includes the APIs for XXsize()
and XXdump(), all range checks inside bio drivers, internal variables
for disklabel handling, and even uvm's swap offsets. re-read numerous
times by otto, miod, krw, thib to look for errors
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/amd64/disksubr.c | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/amd64/machdep.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/amd64/amd64/disksubr.c b/sys/arch/amd64/amd64/disksubr.c index 47e36a46727..63b91cd1244 100644 --- a/sys/arch/amd64/amd64/disksubr.c +++ b/sys/arch/amd64/amd64/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.38 2007/06/06 16:42:03 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.39 2007/06/06 17:15:11 deraadt Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -76,7 +76,7 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *), unsigned long extoff = 0; unsigned int fattest; struct buf *bp = NULL; - daddr_t part_blkno = DOSBBSECTOR; + daddr64_t part_blkno = DOSBBSECTOR; dev_t devno; char *msg = NULL; int dospartoff, cyl, i, ourpart = -1; diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index ac74697d2ea..f1aa836c45d 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.58 2007/05/29 20:36:47 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.59 2007/06/06 17:15:11 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */ /*- @@ -815,7 +815,7 @@ long dumplo = 0; /* blocks */ int cpu_dump(void) { - int (*dump)(dev_t, daddr_t, caddr_t, size_t); + int (*dump)(dev_t, daddr64_t, caddr_t, size_t); char buf[dbtob(1)]; kcore_seg_t *segp; cpu_kcore_hdr_t *cpuhdrp; @@ -908,8 +908,8 @@ dumpsys(void) { u_long totalbytesleft, bytes, i, n, memseg; u_long maddr; - daddr_t blkno; - int (*dump)(dev_t, daddr_t, caddr_t, size_t); + daddr64_t blkno; + int (*dump)(dev_t, daddr64_t, caddr_t, size_t); int error; /* Save registers. */ |