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/i386 | |
| 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/i386')
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 8 | ||||
| -rw-r--r-- | sys/arch/i386/stand/installboot/installboot.c | 6 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/softraid.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 36ba79d3691..79243860146 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.522 2013/05/16 19:26:04 kettenis Exp $ */ +/* $OpenBSD: machdep.c,v 1.523 2013/06/11 16:42:08 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -2683,7 +2683,7 @@ dumpconf(void) int cpu_dump() { - int (*dump)(dev_t, daddr64_t, caddr_t, size_t); + int (*dump)(dev_t, daddr_t, caddr_t, size_t); long buf[dbtob(1) / sizeof (long)]; kcore_seg_t *segp; @@ -2720,8 +2720,8 @@ dumpsys() { u_int i, j, npg; int maddr; - 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; char *str; extern int msgbufmapped; diff --git a/sys/arch/i386/stand/installboot/installboot.c b/sys/arch/i386/stand/installboot/installboot.c index c604c3af0eb..00dd0dd54bf 100644 --- a/sys/arch/i386/stand/installboot/installboot.c +++ b/sys/arch/i386/stand/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.68 2013/01/16 15:35:33 naddy Exp $ */ +/* $OpenBSD: installboot.c,v 1.69 2013/06/11 16:42:08 deraadt Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -99,7 +99,7 @@ struct sym_data pbr_symbols[] = { static char *loadproto(char *, long *); static int getbootparams(char *, int, struct disklabel *); -static void devread(int, void *, daddr64_t, size_t, char *); +static void devread(int, void *, daddr_t, size_t, char *); static void sym_set_value(struct sym_data *, char *, u_int32_t); static void pbr_set_symbols(char *, char *, struct sym_data *); static void usage(void); @@ -398,7 +398,7 @@ loadproto(char *fname, long *size) } static void -devread(int fd, void *buf, daddr64_t blk, size_t size, char *msg) +devread(int fd, void *buf, daddr_t blk, size_t size, char *msg) { if (lseek(fd, dbtob((off_t)blk), SEEK_SET) != dbtob((off_t)blk)) err(1, "%s: devread: lseek", msg); diff --git a/sys/arch/i386/stand/libsa/softraid.c b/sys/arch/i386/stand/libsa/softraid.c index 566f13f955e..0e63e2c641a 100644 --- a/sys/arch/i386/stand/libsa/softraid.c +++ b/sys/arch/i386/stand/libsa/softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid.c,v 1.3 2013/04/04 11:18:03 halex Exp $ */ +/* $OpenBSD: softraid.c,v 1.4 2013/06/11 16:42:09 deraadt Exp $ */ /* * Copyright (c) 2012 Joel Sing <jsing@openbsd.org> @@ -280,7 +280,7 @@ sr_strategy(struct sr_boot_volume *bv, int rw, daddr32_t blk, size_t size, struct sr_boot_chunk *bc; struct aes_xts_ctx ctx; size_t i, j, nsect; - daddr64_t blkno; + daddr_t blkno; u_char iv[8]; u_char *bp; int err; |