diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-06-11 16:42:20 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-06-11 16:42:20 +0000 |
| commit | 6b46236c83f9aa5b9cd59b466eeba348ee23825a (patch) | |
| tree | ef7eca8601ed03d00b5a9a53b3355f66ed478486 /sys/arch/alpha | |
| parent | cc20036a151815396b8c4285e8b3b56f0172f1d5 (diff) | |
final removal of daddr64_t. daddr_t has been 64 bit for a long enough
test period; i think 3 years ago the last bugs fell out.
ok otto beck others
Diffstat (limited to 'sys/arch/alpha')
| -rw-r--r-- | sys/arch/alpha/alpha/machdep.c | 8 | ||||
| -rw-r--r-- | sys/arch/alpha/stand/installboot.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c index a66a81c01d0..58f27253ea7 100644 --- a/sys/arch/alpha/alpha/machdep.c +++ b/sys/arch/alpha/alpha/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.140 2012/12/02 07:03:30 guenther Exp $ */ +/* $OpenBSD: machdep.c,v 1.141 2013/06/11 16:42:06 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */ /*- @@ -1112,7 +1112,7 @@ cpu_dump_mempagecnt() int cpu_dump() { - int (*dump)(dev_t, daddr64_t, caddr_t, size_t); + int (*dump)(dev_t, daddr_t, caddr_t, size_t); char buf[dbtob(1)]; kcore_seg_t *segp; cpu_kcore_hdr_t *cpuhdrp; @@ -1196,8 +1196,8 @@ dumpsys() u_long totalbytesleft, bytes, i, n, memcl; u_long maddr; int psize; - daddr64_t blkno; - int (*dump)(dev_t, daddr64_t, caddr_t, size_t); + daddr_t blkno; + int (*dump)(dev_t, daddr_t, caddr_t, size_t); int error; extern int msgbufmapped; diff --git a/sys/arch/alpha/stand/installboot.c b/sys/arch/alpha/stand/installboot.c index cecfcd3bd80..57e039a55b1 100644 --- a/sys/arch/alpha/stand/installboot.c +++ b/sys/arch/alpha/stand/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.16 2011/03/13 00:13:51 deraadt Exp $ */ +/* $OpenBSD: installboot.c,v 1.17 2013/06/11 16:42:06 deraadt Exp $ */ /* $NetBSD: installboot.c,v 1.2 1997/04/06 08:41:12 cgd Exp $ */ /* @@ -92,7 +92,7 @@ main(int argc, char *argv[]) long protosize; struct stat disksb, bootsb; struct disklabel dl; - daddr64_t partoffset; + daddr_t partoffset; #define BBPAD 0x1e0 struct bb { char bb_pad[BBPAD]; /* disklabel lives in here, actually */ |