diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2006-07-26 23:15:56 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2006-07-26 23:15:56 +0000 |
| commit | f78c3a4873b7ac6d8542d8b1888e62f6390fafcd (patch) | |
| tree | fdb46e44ed12285682117fce41ef9f58ad9a184b /sys/uvm/uvm_swap.c | |
| parent | e6e11ab4c6cceddb993fb4b1dda8f493f4e52b2c (diff) | |
fix fmts for UVMHIST_LOG() entries making it more useful on 64bit archs; miod@ ok
Diffstat (limited to 'sys/uvm/uvm_swap.c')
| -rw-r--r-- | sys/uvm/uvm_swap.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/uvm/uvm_swap.c b/sys/uvm/uvm_swap.c index 71b1a7b9481..9c29e45acad 100644 --- a/sys/uvm/uvm_swap.c +++ b/sys/uvm/uvm_swap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_swap.c,v 1.63 2006/07/13 22:51:26 deraadt Exp $ */ +/* $OpenBSD: uvm_swap.c,v 1.64 2006/07/26 23:15:55 mickey Exp $ */ /* $NetBSD: uvm_swap.c,v 1.40 2000/11/17 11:39:39 mrg Exp $ */ /* @@ -1012,7 +1012,8 @@ swap_on(p, sdp) goto bad; } - UVMHIST_LOG(pdhist, " dev=%x: size=%d addr=%ld\n", dev, size, addr, 0); + UVMHIST_LOG(pdhist, " dev=%x: size=%d addr=0x%lx\n", + dev, size, addr, 0); /* * now we need to allocate an extent to manage this swap device @@ -1236,7 +1237,7 @@ swstrategy(bp) pageno -= sdp->swd_drumoffset; /* page # on swapdev */ bn = btodb((u_int64_t)pageno << PAGE_SHIFT); /* convert to diskblock */ - UVMHIST_LOG(pdhist, " %s: mapoff=%x bn=%x bcount=%ld", + UVMHIST_LOG(pdhist, " %s: mapoff=%x bn=0x%x bcount=%ld", ((bp->b_flags & B_READ) == 0) ? "write" : "read", sdp->swd_drumoffset, bn, bp->b_bcount); @@ -1362,7 +1363,7 @@ sw_reg_strategy(sdp, bp, bn) sz = resid; UVMHIST_LOG(pdhist, "sw_reg_strategy: " - "vp %p/%p offset 0x%x/0x%x", + "vp %p/%p offset 0x%llx/0x%x", sdp->swd_vp, vp, byteoff, nbn); /* @@ -1478,7 +1479,7 @@ sw_reg_start(sdp) sdp->swd_tab.b_active++; UVMHIST_LOG(pdhist, - "sw_reg_start: bp %p vp %p blkno %p cnt %lx", + "sw_reg_start: bp %p vp %p blkno 0x%x cnt 0x%lx", bp, bp->b_vp, bp->b_blkno, bp->b_bcount); if ((bp->b_flags & B_READ) == 0) bp->b_vp->v_numoutput++; @@ -1504,7 +1505,7 @@ sw_reg_iodone(bp) int resid; UVMHIST_FUNC("sw_reg_iodone"); UVMHIST_CALLED(pdhist); - UVMHIST_LOG(pdhist, " vbp=%p vp=%p blkno=%x addr=%p", + UVMHIST_LOG(pdhist, " vbp=%p vp=%p blkno=0x%x addr=%p", vbp, vbp->vb_buf.b_vp, vbp->vb_buf.b_blkno, vbp->vb_buf.b_data); UVMHIST_LOG(pdhist, " cnt=%lx resid=%lx", vbp->vb_buf.b_bcount, vbp->vb_buf.b_resid, 0, 0); |