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/i386 | |
| 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/i386')
| -rw-r--r-- | sys/arch/i386/i386/disksubr.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/i386/i386/disksubr.c b/sys/arch/i386/i386/disksubr.c index ef955d27a98..206453d5da6 100644 --- a/sys/arch/i386/i386/disksubr.c +++ b/sys/arch/i386/i386/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.78 2007/06/06 16:42:06 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.79 2007/06/06 17:15:12 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/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 8d24c76d5a6..2db15f2b8fd 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.400 2007/06/04 06:57:56 jsg Exp $ */ +/* $OpenBSD: machdep.c,v 1.401 2007/06/06 17:15:12 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -2493,7 +2493,7 @@ dumpconf(void) int cpu_dump() { - int (*dump)(dev_t, daddr_t, caddr_t, size_t); + int (*dump)(dev_t, daddr64_t, caddr_t, size_t); long buf[dbtob(1) / sizeof (long)]; kcore_seg_t *segp; @@ -2530,8 +2530,8 @@ dumpsys() { u_int i, j, npg; int 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; char *str; extern int msgbufmapped; @@ -2574,7 +2574,7 @@ dumpsys() maddr = ctob(dumpmem[i].start); blkno = dumplo + btodb(maddr) + 1; #if 0 - printf("(%d %ld %d) ", maddr, blkno, npg); + printf("(%d %lld %d) ", maddr, blkno, npg); #endif for (j = npg; j--; maddr += NBPG, blkno += btodb(NBPG)) { @@ -2583,7 +2583,7 @@ dumpsys() printf("%d ", (ctob(dumpsize) - maddr) / (1024 * 1024)); #if 0 - printf("(%x %d) ", maddr, blkno); + printf("(%x %lld) ", maddr, blkno); #endif pmap_enter(pmap_kernel(), dumpspace, maddr, VM_PROT_READ, PMAP_WIRED); |