summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/hp300/dev/hd.c4
-rw-r--r--sys/arch/i386/i386/machdep.c6
-rw-r--r--sys/arch/sparc/dev/fd.c15
-rw-r--r--sys/arch/sparc/dev/xd.c4
-rw-r--r--sys/arch/sparc/dev/xy.c4
-rw-r--r--sys/arch/sparc64/dev/fd.c12
-rw-r--r--sys/arch/sparc64/sparc64/machdep.c4
7 files changed, 26 insertions, 23 deletions
diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c
index 36a40b58056..5aa59b1527d 100644
--- a/sys/arch/hp300/dev/hd.c
+++ b/sys/arch/hp300/dev/hd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hd.c,v 1.72 2013/10/14 23:26:22 krw Exp $ */
+/* $OpenBSD: hd.c,v 1.73 2013/11/01 17:36:19 krw Exp $ */
/* $NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $ */
/*
@@ -1049,7 +1049,7 @@ hderror(unit)
hdprinterr("fault", sp->c_fef, err_fault);
hdprinterr("access", sp->c_aef, err_access);
hdprinterr("info", sp->c_ief, err_info);
- printf(" block: %lld, P1-P10: ", hwbn);
+ printf(" block: %lld, P1-P10: ", (long long)hwbn);
printf("0x%04x", *(u_int *)&sp->c_raw[0]);
printf("%04x", *(u_int *)&sp->c_raw[4]);
printf("%02x\n", *(u_short *)&sp->c_raw[8]);
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index eb3bab857e1..7a61ff551ad 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.527 2013/10/17 08:02:15 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.528 2013/11/01 17:36:19 krw Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -2803,7 +2803,7 @@ dumpsys()
maddr = ptoa(dumpmem[i].start);
blkno = dumplo + btodb(maddr) + 1;
#if 0
- printf("(%d %lld %d) ", maddr, blkno, npg);
+ printf("(%d %lld %d) ", maddr, (long long)blkno, npg);
#endif
for (j = npg; j--; maddr += NBPG, blkno += btodb(NBPG)) {
@@ -2812,7 +2812,7 @@ dumpsys()
printf("%ld ",
(ptoa(dumpsize) - maddr) / (1024 * 1024));
#if 0
- printf("(%x %lld) ", maddr, blkno);
+ printf("(%x %lld) ", maddr, (long long)blkno);
#endif
pmap_enter(pmap_kernel(), dumpspace, maddr,
VM_PROT_READ, PMAP_WIRED);
diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c
index 7d9cadf029b..ca2784aedd1 100644
--- a/sys/arch/sparc/dev/fd.c
+++ b/sys/arch/sparc/dev/fd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fd.c,v 1.84 2013/06/11 16:42:11 deraadt Exp $ */
+/* $OpenBSD: fd.c,v 1.85 2013/11/01 17:36:19 krw Exp $ */
/* $NetBSD: fd.c,v 1.51 1997/05/24 20:16:19 pk Exp $ */
/*-
@@ -727,8 +727,9 @@ fdstrategy(bp)
#ifdef FD_DEBUG
if (fdc_debug > 1)
- printf("fdstrategy: b_blkno %d b_bcount %ld blkno %lld cylin %ld\n",
- bp->b_blkno, bp->b_bcount, fd->sc_blkno, bp->b_cylinder);
+ printf("fdstrategy: b_blkno %lld b_bcount %ld blkno %lld "
+ "cylin %ld\n", (long long)bp->b_blkno, bp->b_bcount,
+ (long long)fd->sc_blkno, bp->b_cylinder);
#endif
/* Queue transfer on drive, activate drive and controller if idle. */
@@ -1380,9 +1381,11 @@ loop:
sec -= head * type->sectrac;
#ifdef DIAGNOSTIC
{int block;
- block = (fd->sc_cylin * type->heads + head) * type->sectrac + sec;
+ block = (fd->sc_cylin * type->heads + head) * type->sectrac +
+ sec;
if (block != fd->sc_blkno) {
- printf("fdcintr: block %d != blkno %lld\n", block, fd->sc_blkno);
+ printf("fdcintr: block %d != blkno %lld\n", block,
+ (long long)fd->sc_blkno);
#if defined(FD_DEBUG) && defined(DDB)
Debugger();
#endif
@@ -1510,7 +1513,7 @@ loop:
bp->b_flags & B_READ
? "read failed" : "write failed");
printf("blkno %lld nblks %d nstat %d tc %d\n",
- fd->sc_blkno, fd->sc_nblks,
+ (long long)fd->sc_blkno, fd->sc_nblks,
fdc->sc_nstat, fdc->sc_tc);
}
#endif
diff --git a/sys/arch/sparc/dev/xd.c b/sys/arch/sparc/dev/xd.c
index f16c7bce5e5..6704b446425 100644
--- a/sys/arch/sparc/dev/xd.c
+++ b/sys/arch/sparc/dev/xd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xd.c,v 1.60 2013/10/20 10:11:16 krw Exp $ */
+/* $OpenBSD: xd.c,v 1.61 2013/11/01 17:36:19 krw Exp $ */
/* $NetBSD: xd.c,v 1.37 1997/07/29 09:58:16 fair Exp $ */
/*
@@ -1381,7 +1381,7 @@ xdc_startbuf(xdcsc, xdsc, bp)
#ifdef XDC_DEBUG
printf("xdc_startbuf: %s%c: %s block %lld\n",
xdsc->sc_dev.dv_xname, 'a' + partno,
- (bp->b_flags & B_READ) ? "read" : "write", bp->b_blkno);
+ (bp->b_flags & B_READ) ? "read" : "write", (long long)bp->b_blkno);
printf("xdc_startbuf: b_bcount %d, b_data 0x%x\n",
bp->b_bcount, bp->b_data);
#endif
diff --git a/sys/arch/sparc/dev/xy.c b/sys/arch/sparc/dev/xy.c
index ba0be46bd01..ea4838dee00 100644
--- a/sys/arch/sparc/dev/xy.c
+++ b/sys/arch/sparc/dev/xy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xy.c,v 1.56 2013/10/20 10:11:16 krw Exp $ */
+/* $OpenBSD: xy.c,v 1.57 2013/11/01 17:36:19 krw Exp $ */
/* $NetBSD: xy.c,v 1.26 1997/07/19 21:43:56 pk Exp $ */
/*
@@ -1238,7 +1238,7 @@ xyc_startbuf(xycsc, xysc, bp)
#ifdef XYC_DEBUG
printf("xyc_startbuf: %s%c: %s block %lld\n",
xysc->sc_dev.dv_xname, 'a' + partno,
- (bp->b_flags & B_READ) ? "read" : "write", bp->b_blkno);
+ (bp->b_flags & B_READ) ? "read" : "write", (long long)bp->b_blkno);
printf("xyc_startbuf: b_bcount %d, b_data 0x%x\n",
bp->b_bcount, bp->b_data);
#endif
diff --git a/sys/arch/sparc64/dev/fd.c b/sys/arch/sparc64/dev/fd.c
index 3f745b8e7df..72b1c785d12 100644
--- a/sys/arch/sparc64/dev/fd.c
+++ b/sys/arch/sparc64/dev/fd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fd.c,v 1.40 2013/10/20 10:11:17 krw Exp $ */
+/* $OpenBSD: fd.c,v 1.41 2013/11/01 17:36:19 krw Exp $ */
/* $NetBSD: fd.c,v 1.112 2003/08/07 16:29:35 agc Exp $ */
/*-
@@ -748,8 +748,8 @@ fdstrategy(bp)
#ifdef FD_DEBUG
if (fdc_debug > 1)
printf("fdstrategy: b_blkno %lld b_bcount %d blkno %lld cylin %d\n",
- bp->b_blkno, bp->b_bcount,
- fd->sc_blkno, bp->b_cylinder);
+ (long long)bp->b_blkno, bp->b_bcount,
+ (long long)fd->sc_blkno, bp->b_cylinder);
#endif
/* Queue transfer on drive, activate drive and controller if idle. */
@@ -1456,8 +1456,8 @@ loop:
block = (fd->sc_cylin * type->heads + head) *
type->sectrac + sec;
if (block != fd->sc_blkno) {
- printf("fdcintr: block %lld != blkno %d\n",
- block, (int)fd->sc_blkno);
+ printf("fdcintr: block %lld != blkno %lld\n",
+ (long long)block, (long long)fd->sc_blkno);
#if defined(FD_DEBUG) && defined(DDB)
Debugger();
#endif
@@ -1589,7 +1589,7 @@ loop:
bp->b_flags & B_READ
? "read failed" : "write failed");
printf("blkno %lld nblks %d nstat %d tc %d\n",
- fd->sc_blkno, fd->sc_nblks,
+ (long long)fd->sc_blkno, fd->sc_nblks,
fdc->sc_nstat, fdc->sc_tc);
}
#endif
diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c
index e35b092009a..be3d7ca1675 100644
--- a/sys/arch/sparc64/sparc64/machdep.c
+++ b/sys/arch/sparc64/sparc64/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.148 2013/09/28 12:40:32 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.149 2013/11/01 17:36:19 krw Exp $ */
/* $NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */
/*-
@@ -802,7 +802,7 @@ dumpsys()
error = pmap_dumpmmu(dump, blkno);
blkno += pmap_dumpsize();
-printf("starting dump, blkno %lld\n", blkno);
+printf("starting dump, blkno %lld\n", (long long)blkno);
for (mp = mem; mp->size; mp++) {
u_int64_t i = 0, n;
paddr_t maddr = mp->start;
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-22 21:30:15 +0000