summaryrefslogtreecommitdiff
path: root/sys/arch/sparc/dev/fd.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/sparc/dev/fd.c')
-rw-r--r--sys/arch/sparc/dev/fd.c15
1 files changed, 9 insertions, 6 deletions
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