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/macppc | |
| 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/macppc')
| -rw-r--r-- | sys/arch/macppc/macppc/disksubr.c | 4 | ||||
| -rw-r--r-- | sys/arch/macppc/macppc/machdep.c | 8 | ||||
| -rw-r--r-- | sys/arch/macppc/stand/ofdev.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/macppc/macppc/disksubr.c b/sys/arch/macppc/macppc/disksubr.c index c4792457d20..fccd1135086 100644 --- a/sys/arch/macppc/macppc/disksubr.c +++ b/sys/arch/macppc/macppc/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.43 2007/06/06 16:42:06 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.44 2007/06/06 17:15:12 deraadt Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -72,7 +72,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; char *msg = NULL; char *s; int dospartoff, cyl, i, ourpart = -1; diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c index a287c034ca5..ba5be68cfda 100644 --- a/sys/arch/macppc/macppc/machdep.c +++ b/sys/arch/macppc/macppc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.92 2007/05/29 20:36:47 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.93 2007/06/06 17:15:12 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -779,7 +779,7 @@ int cpu_dump(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; @@ -802,8 +802,8 @@ dumpsys() #if 0 u_int npg; u_int i, j; - 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); char *str; int maddr; extern int msgbufmapped; diff --git a/sys/arch/macppc/stand/ofdev.c b/sys/arch/macppc/stand/ofdev.c index 6ab2517727a..6130b465c17 100644 --- a/sys/arch/macppc/stand/ofdev.c +++ b/sys/arch/macppc/stand/ofdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofdev.c,v 1.11 2007/06/02 15:28:09 deraadt Exp $ */ +/* $OpenBSD: ofdev.c,v 1.12 2007/06/06 17:15:12 deraadt Exp $ */ /* $NetBSD: ofdev.c,v 1.1 1997/04/16 20:29:20 thorpej Exp $ */ /* @@ -98,7 +98,7 @@ filename(char *str, char *ppart) } static int -strategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf, +strategy(void *devdata, int rw, daddr64_t blk, size_t size, void *buf, size_t *rsize) { struct of_dev *dev = devdata; |