fix fmts for UVMHIST_LOG() entries making it more useful on 64bit archs; miod@ ok

13 files changed, 117 insertions, 116 deletions

diff --git a/sys/uvm/uvm_amap.c b/sys/uvm/uvm_amap.c
index a9ae6253c7a..e9bbaf01e5c 100644
--- a/sys/uvm/uvm_amap.c
+++ b/sys/uvm/uvm_amap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_amap.c,v 1.31 2006/07/13 22:51:26 deraadt Exp $	*/
+/*	$OpenBSD: uvm_amap.c,v 1.32 2006/07/26 23:15:55 mickey Exp $	*/
 /*	$NetBSD: uvm_amap.c,v 1.27 2000/11/25 06:27:59 chs Exp $	*/
 
 /*
@@ -239,7 +239,7 @@ amap_alloc(sz, padsz, waitf)
 		memset(amap->am_anon, 0,
 		    amap->am_maxslot * sizeof(struct vm_anon *));
 
-	UVMHIST_LOG(maphist,"<- done, amap = 0x%x, sz=%d", amap, sz, 0, 0);
+	UVMHIST_LOG(maphist,"<- done, amap = %p, sz=%lu", amap, sz, 0, 0);
 	return(amap);
 }
 
@@ -268,7 +268,7 @@ amap_free(amap)
 	amap_unlock(amap);	/* mainly for lock debugging */
 	pool_put(&uvm_amap_pool, amap);
 
-	UVMHIST_LOG(maphist,"<- done, freed amap = 0x%x", amap, 0, 0, 0);
+	UVMHIST_LOG(maphist,"<- done, freed amap = %p", amap, 0, 0, 0);
 }
 
 /*
@@ -297,7 +297,7 @@ amap_extend(entry, addsize)
 	int slotadded;
 	UVMHIST_FUNC("amap_extend"); UVMHIST_CALLED(maphist);
 
-	UVMHIST_LOG(maphist, "  (entry=0x%x, addsize=0x%x)", entry,addsize,0,0);
+	UVMHIST_LOG(maphist, "  (entry=%p, addsize=%lu)", entry, addsize, 0, 0);
 
 	/*
 	 * first, determine how many slots we need in the amap.  don't
@@ -323,7 +323,7 @@ amap_extend(entry, addsize)
 		}
 #endif
 		amap_unlock(amap);
-		UVMHIST_LOG(maphist,"<- done (case 1), amap = 0x%x, sltneed=%d", 
+		UVMHIST_LOG(maphist,"<- done (case 1), amap = %p, sltneed=%d", 
 		    amap, slotneed, 0, 0);
 		return (0);
 	}
@@ -351,8 +351,8 @@ amap_extend(entry, addsize)
 		 * no need to zero am_anon since that was done at
 		 * alloc time and we never shrink an allocation.
 		 */
-		UVMHIST_LOG(maphist,"<- done (case 2), amap = 0x%x, "
-		    "slotneed=%d", amap, slotneed, 0, 0);
+		UVMHIST_LOG(maphist,"<- done (case 2), amap = %p, slotneed=%d",
+		    amap, slotneed, 0, 0);
 		return (0);
 	}
 
@@ -452,7 +452,7 @@ amap_extend(entry, addsize)
 	if (oldppref && oldppref != PPREF_NONE)
 		free(oldppref, M_UVMAMAP);
 #endif
-	UVMHIST_LOG(maphist,"<- done (case 3), amap = 0x%x, slotneed=%d", 
+	UVMHIST_LOG(maphist,"<- done (case 3), amap = %p, slotneed=%d", 
 	    amap, slotneed, 0, 0);
 	return (0);
 }
@@ -519,7 +519,7 @@ amap_wipeout(amap)
 	int lcv, slot;
 	struct vm_anon *anon;
 	UVMHIST_FUNC("amap_wipeout"); UVMHIST_CALLED(maphist);
-	UVMHIST_LOG(maphist,"(amap=0x%x)", amap, 0,0,0);
+	UVMHIST_LOG(maphist,"(amap=%p)", amap, 0,0,0);
 
 	for (lcv = 0 ; lcv < amap->am_nused ; lcv++) {
 		int refs;
@@ -532,7 +532,7 @@ amap_wipeout(amap)
 
 		simple_lock(&anon->an_lock); /* lock anon */
 
-		UVMHIST_LOG(maphist,"  processing anon 0x%x, ref=%d", anon, 
+		UVMHIST_LOG(maphist,"  processing anon %p, ref=%d", anon, 
 		    anon->an_ref, 0, 0);
 
 		refs = --anon->an_ref;
@@ -602,17 +602,17 @@ amap_copy(map, entry, waitf, canchunk, startva, endva)
 			chunksize = UVM_AMAP_CHUNK << PAGE_SHIFT;
 			startva = (startva / chunksize) * chunksize;
 			endva = roundup(endva, chunksize);
-			UVMHIST_LOG(maphist, "  chunk amap ==> clip 0x%x->0x%x"
-			    "to 0x%x->0x%x", entry->start, entry->end, startva,
-			    endva);
+			UVMHIST_LOG(maphist, "  chunk amap ==> clip "
+			    "0x%lx->0x%lx to 0x%lx->0x%lx",
+			    entry->start, entry->end, startva, endva);
 			UVM_MAP_CLIP_START(map, entry, startva);
 			/* watch out for endva wrap-around! */
 			if (endva >= startva)
 				UVM_MAP_CLIP_END(map, entry, endva);
 		}
 
-		UVMHIST_LOG(maphist, "<- done [creating new amap 0x%x->0x%x]", 
-		entry->start, entry->end, 0, 0);
+		UVMHIST_LOG(maphist, "<- done [creating new amap 0x%lx->0x%lx]",
+		    entry->start, entry->end, 0, 0);
 		entry->aref.ar_pageoff = 0;
 		entry->aref.ar_amap = amap_alloc(entry->end - entry->start, 0,
 		    waitf);
diff --git a/sys/uvm/uvm_amap_i.h b/sys/uvm/uvm_amap_i.h
index a290527b378..6c35f1b95ed 100644
--- a/sys/uvm/uvm_amap_i.h
+++ b/sys/uvm/uvm_amap_i.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_amap_i.h,v 1.14 2006/07/13 22:51:26 deraadt Exp $	*/
+/*	$OpenBSD: uvm_amap_i.h,v 1.15 2006/07/26 23:15:55 mickey Exp $	*/
 /*	$NetBSD: uvm_amap_i.h,v 1.15 2000/11/25 06:27:59 chs Exp $	*/
 
 /*
@@ -69,7 +69,7 @@ amap_lookup(aref, offset)
 	if (slot >= amap->am_nslot)
 		panic("amap_lookup: offset out of range");
 
-	UVMHIST_LOG(maphist, "<- done (amap=0x%x, offset=0x%x, result=0x%x)",
+	UVMHIST_LOG(maphist, "<- done (amap=%p, offset=0x%lx, result=%p)",
 	    amap, offset, amap->am_anon[slot], 0);
 	return(amap->am_anon[slot]);
 }
@@ -153,7 +153,7 @@ amap_add(aref, offset, anon, replace)
 	}
 	amap->am_anon[slot] = anon;
 	UVMHIST_LOG(maphist,
-	    "<- done (amap=0x%x, offset=0x%x, anon=0x%x, rep=%d)",
+	    "<- done (amap=%p, offset=0x%lx, anon=%p, rep=%d)",
 	    amap, offset, anon, replace);
 }
 
@@ -188,7 +188,7 @@ amap_unadd(aref, offset)
 		amap->am_bckptr[amap->am_slots[ptr]] = ptr;	/* back link */
 	}
 	amap->am_nused--;
-	UVMHIST_LOG(maphist, "<- done (amap=0x%x, slot=0x%x)", amap, slot,0, 0);
+	UVMHIST_LOG(maphist, "<- done (amap=%p, slot=%d)", amap, slot,0, 0);
 }
 
 /*
@@ -223,7 +223,7 @@ amap_ref(amap, offset, len, flags)
 	}
 #endif
 	amap_unlock(amap);
-	UVMHIST_LOG(maphist,"<- done!  amap=0x%x", amap, 0, 0, 0);
+	UVMHIST_LOG(maphist,"<- done!  amap=%p", amap, 0, 0, 0);
 }
 
 /*
@@ -248,7 +248,7 @@ amap_unref(amap, offset, len, all)
 	 * lock it
 	 */
 	amap_lock(amap);
-	UVMHIST_LOG(maphist,"  amap=0x%x  refs=%d, nused=%d",
+	UVMHIST_LOG(maphist,"  amap=%p  refs=%d, nused=%d",
 	    amap, amap->am_ref, amap->am_nused, 0);
 
 	/*
diff --git a/sys/uvm/uvm_anon.c b/sys/uvm/uvm_anon.c
index f24114aee9e..9ab59e547a9 100644
--- a/sys/uvm/uvm_anon.c
+++ b/sys/uvm/uvm_anon.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_anon.c,v 1.23 2006/07/13 22:51:26 deraadt Exp $	*/
+/*	$OpenBSD: uvm_anon.c,v 1.24 2006/07/26 23:15:55 mickey Exp $	*/
 /*	$NetBSD: uvm_anon.c,v 1.10 2000/11/25 06:27:59 chs Exp $	*/
 
 /*
@@ -184,7 +184,7 @@ uvm_anfree(anon)
 {
 	struct vm_page *pg;
 	UVMHIST_FUNC("uvm_anfree"); UVMHIST_CALLED(maphist);
-	UVMHIST_LOG(maphist,"(anon=0x%x)", anon, 0,0,0);
+	UVMHIST_LOG(maphist,"(anon=%p)", anon, 0,0,0);
 
 	/*
 	 * get page
@@ -235,7 +235,7 @@ uvm_anfree(anon)
 				/* tell them to dump it when done */
 				pg->flags |= PG_RELEASED;
 				UVMHIST_LOG(maphist,
-				    "  anon 0x%x, page 0x%x: BUSY (released!)", 
+				    "  anon %p, page %p: BUSY (released!)", 
 				    anon, pg, 0, 0);
 				return;
 			} 
@@ -243,7 +243,7 @@ uvm_anfree(anon)
 			uvm_lock_pageq();	/* lock out pagedaemon */
 			uvm_pagefree(pg);	/* bye bye */
 			uvm_unlock_pageq();	/* free the daemon */
-			UVMHIST_LOG(maphist,"anon 0x%x, page 0x%x: freed now!",
+			UVMHIST_LOG(maphist,"anon %p, page %p: freed now!",
 			    anon, pg, 0, 0);
 		}
 	}
diff --git a/sys/uvm/uvm_aobj.c b/sys/uvm/uvm_aobj.c
index 0208e2b3b53..14762ae5501 100644
--- a/sys/uvm/uvm_aobj.c
+++ b/sys/uvm/uvm_aobj.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_aobj.c,v 1.29 2005/11/15 21:09:46 miod Exp $	*/
+/*	$OpenBSD: uvm_aobj.c,v 1.30 2006/07/26 23:15:55 mickey Exp $	*/
 /*	$NetBSD: uvm_aobj.c,v 1.39 2001/02/18 21:19:08 chs Exp $	*/
 
 /*
@@ -625,7 +625,7 @@ uao_reference_locked(uobj)
 		return;
 
 	uobj->uo_refs++;		/* bump! */
-	UVMHIST_LOG(maphist, "<- done (uobj=0x%x, ref = %d)", 
+	UVMHIST_LOG(maphist, "<- done (uobj=%p, ref = %d)", 
 		    uobj, uobj->uo_refs,0,0);
 }
 
@@ -670,7 +670,7 @@ uao_detach_locked(uobj)
 		return;
 	}
 
-	UVMHIST_LOG(maphist,"  (uobj=0x%x)  ref=%d", uobj,uobj->uo_refs,0,0);
+	UVMHIST_LOG(maphist,"  (uobj=%p)  ref=%d", uobj,uobj->uo_refs,0,0);
 	uobj->uo_refs--;				/* drop ref! */
 	if (uobj->uo_refs) {				/* still more refs? */
 		simple_unlock(&uobj->vmobjlock);
@@ -812,7 +812,7 @@ uao_flush(uobj, start, stop, flags)
 	}
 
 	UVMHIST_LOG(maphist,
-	    " flush start=0x%lx, stop=0x%x, by_list=%d, flags=0x%x",
+	    " flush start=0x%llx, stop=0x%llx, by_list=%d, flags=0x%x",
 	    start, stop, by_list, flags);
 
 	/*
@@ -965,7 +965,7 @@ uao_get(uobj, offset, pps, npagesp, centeridx, access_type, advice, flags)
 	boolean_t done;
 	UVMHIST_FUNC("uao_get"); UVMHIST_CALLED(pdhist);
 
-	UVMHIST_LOG(pdhist, "aobj=%p offset=%d, flags=%d",
+	UVMHIST_LOG(pdhist, "aobj=%p offset=%lld, flags=%d",
 		    aobj, offset, flags,0);
 
 	/*
diff --git a/sys/uvm/uvm_device.c b/sys/uvm/uvm_device.c
index 89fd553831d..f7b31dab160 100644
--- a/sys/uvm/uvm_device.c
+++ b/sys/uvm/uvm_device.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_device.c,v 1.25 2006/01/16 13:11:05 mickey Exp $	*/
+/*	$OpenBSD: uvm_device.c,v 1.26 2006/07/26 23:15:55 mickey Exp $	*/
 /*	$NetBSD: uvm_device.c,v 1.30 2000/11/25 06:27:59 chs Exp $	*/
 
 /*
@@ -278,7 +278,7 @@ udv_reference(uobj)
 
 	simple_lock(&uobj->vmobjlock);
 	uobj->uo_refs++;
-	UVMHIST_LOG(maphist, "<- done (uobj=0x%x, ref = %d)", 
+	UVMHIST_LOG(maphist, "<- done (uobj=%p, ref = %d)", 
 		    uobj, uobj->uo_refs,0,0);
 	simple_unlock(&uobj->vmobjlock);
 }
@@ -306,7 +306,7 @@ again:
 	if (uobj->uo_refs > 1) {
 		uobj->uo_refs--;
 		simple_unlock(&uobj->vmobjlock);
-		UVMHIST_LOG(maphist," <- done, uobj=0x%x, ref=%d", 
+		UVMHIST_LOG(maphist," <- done, uobj=%p, ref=%d", 
 			  uobj,uobj->uo_refs,0,0);
 		return;
 	}
@@ -334,7 +334,7 @@ again:
 	simple_unlock(&udv_lock);
 	simple_unlock(&uobj->vmobjlock);
 	FREE(udv, M_TEMP);
-	UVMHIST_LOG(maphist," <- done, freed uobj=0x%x", uobj,0,0,0);
+	UVMHIST_LOG(maphist," <- done, freed uobj=%p", uobj,0,0,0);
 }
 
 
@@ -399,7 +399,7 @@ udv_fault(ufi, vaddr, pps, npages, centeridx, fault_type, access_type, flags)
 	
 	if (UVM_ET_ISCOPYONWRITE(entry)) {
 		UVMHIST_LOG(maphist, "<- failed -- COW entry (etype=0x%x)", 
-		entry->etype, 0,0,0);
+		    entry->etype, 0,0,0);
 		uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, uobj, NULL);
 		return(VM_PAGER_ERROR);
 	}
@@ -444,7 +444,7 @@ udv_fault(ufi, vaddr, pps, npages, centeridx, fault_type, access_type, flags)
 		paddr = pmap_phys_address(mdpgno);
 		mapprot = ufi->entry->protection;
 		UVMHIST_LOG(maphist,
-		    "  MAPPING: device: pm=0x%x, va=0x%x, pa=0x%llx, at=%d",
+		    "  MAPPING: device: pm=%p, va=0x%lx, pa=0x%llx, at=%d",
 		    ufi->orig_map->pmap, curr_va, (long long)paddr, mapprot);
 		if (pmap_enter(ufi->orig_map->pmap, curr_va, paddr,
 		    mapprot, PMAP_CANFAIL | mapprot) != 0) {
diff --git a/sys/uvm/uvm_fault.c b/sys/uvm/uvm_fault.c
index f40c692c50d..54c8e2faea1 100644
--- a/sys/uvm/uvm_fault.c
+++ b/sys/uvm/uvm_fault.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_fault.c,v 1.39 2006/07/13 22:51:26 deraadt Exp $	*/
+/*	$OpenBSD: uvm_fault.c,v 1.40 2006/07/26 23:15:55 mickey Exp $	*/
 /*	$NetBSD: uvm_fault.c,v 1.51 2000/08/06 00:22:53 thorpej Exp $	*/
 
 /*
@@ -577,7 +577,7 @@ uvm_fault(orig_map, vaddr, fault_type, access_type)
 	struct vm_page *pages[UVM_MAXRANGE], *pg, *uobjpage;
 	UVMHIST_FUNC("uvm_fault"); UVMHIST_CALLED(maphist);
 
-	UVMHIST_LOG(maphist, "(map=0x%x, vaddr=0x%x, ft=%d, at=%d)",
+	UVMHIST_LOG(maphist, "(map=%p, vaddr=0x%lx, ft=%d, at=%d)",
 	      orig_map, vaddr, fault_type, access_type);
 
 	anon = NULL;
@@ -621,7 +621,7 @@ ReFault:
 	 */
 
 	if (uvmfault_lookup(&ufi, FALSE) == FALSE) {
-		UVMHIST_LOG(maphist, "<- no mapping @ 0x%x", vaddr, 0,0,0);
+		UVMHIST_LOG(maphist, "<- no mapping @ 0x%lx", vaddr, 0,0,0);
 		return (KERN_INVALID_ADDRESS);
 	}
 	/* locked: maps(read) */
@@ -746,9 +746,9 @@ ReFault:
 	}
 
 	/* locked: maps(read) */
-	UVMHIST_LOG(maphist, "  narrow=%d, back=%d, forw=%d, startva=0x%x",
+	UVMHIST_LOG(maphist, "  narrow=%d, back=%d, forw=%d, startva=0x%lx",
 		    narrow, nback, nforw, startva);
-	UVMHIST_LOG(maphist, "  entry=0x%x, amap=0x%x, obj=0x%x", ufi.entry,
+	UVMHIST_LOG(maphist, "  entry=%p, amap=%p, obj=%p", ufi.entry,
 		    amap, uobj, 0);
 
 	/*
@@ -844,7 +844,7 @@ ReFault:
 			uvm_pageactivate(anon->u.an_page);	/* reactivate */
 			uvm_unlock_pageq();
 			UVMHIST_LOG(maphist,
-			    "  MAPPING: n anon: pm=0x%x, va=0x%x, pg=0x%x",
+			    "  MAPPING: n anon: pm=%p, va=0x%lx, pg=%p",
 			    ufi.orig_map->pmap, currva, anon->u.an_page, 0);
 			uvmexp.fltnamap++;
 
@@ -958,7 +958,7 @@ ReFault:
 				if (lcv == centeridx) {
 					uobjpage = pages[lcv];
 					UVMHIST_LOG(maphist, "  got uobjpage "
-					    "(0x%x) with locked get", 
+					    "(%p) with locked get", 
 					    uobjpage, 0,0,0);
 					continue;
 				}
@@ -976,7 +976,7 @@ ReFault:
 				uvm_pageactivate(pages[lcv]);	/* reactivate */
 				uvm_unlock_pageq();
 				UVMHIST_LOG(maphist,
-				  "  MAPPING: n obj: pm=0x%x, va=0x%x, pg=0x%x",
+				  "  MAPPING: n obj: pm=%p, va=0x%lx, pg=%p",
 				  ufi.orig_map->pmap, currva, pages[lcv], 0);
 				uvmexp.fltnomap++;
 
@@ -1042,7 +1042,7 @@ ReFault:
 	 */
 
 	anon = anons[centeridx];
-	UVMHIST_LOG(maphist, "  case 1 fault: anon=0x%x", anon, 0,0,0);
+	UVMHIST_LOG(maphist, "  case 1 fault: anon=%p", anon, 0,0,0);
 	simple_lock(&anon->an_lock);
 
 	/* locked: maps(read), amap, anon */
@@ -1247,7 +1247,7 @@ ReFault:
 	 * under us between the unlock and the pmap_enter.
 	 */
 
-	UVMHIST_LOG(maphist, "  MAPPING: anon: pm=0x%x, va=0x%x, pg=0x%x",
+	UVMHIST_LOG(maphist, "  MAPPING: anon: pm=%p, va=0x%lx, pg=%p",
 	    ufi.orig_map->pmap, ufi.orig_rvaddr, pg, 0);
 	if (pmap_enter(ufi.orig_map->pmap, ufi.orig_rvaddr, VM_PAGE_TO_PHYS(pg),
 	    enter_prot, access_type | PMAP_CANFAIL | (wired ? PMAP_WIRED : 0))
@@ -1665,7 +1665,7 @@ Case2:
 			uobj = NULL;
 
 			UVMHIST_LOG(maphist,
-			    "  promote uobjpage 0x%x to anon/page 0x%x/0x%x",
+			    "  promote uobjpage %p to anon/page %p/%p",
 			    uobjpage, anon, pg, 0);
 
 		} else {
@@ -1674,7 +1674,7 @@ Case2:
 			 * Page is zero'd and marked dirty by uvm_pagealloc()
 			 * above.
 			 */
-			UVMHIST_LOG(maphist,"  zero fill anon/page 0x%x/0%x",
+			UVMHIST_LOG(maphist,"  zero fill anon/page %p/%p",
 			    anon, pg, 0, 0);
 		}
 
@@ -1695,7 +1695,7 @@ Case2:
 	 */
 
 	UVMHIST_LOG(maphist,
-	    "  MAPPING: case2: pm=0x%x, va=0x%x, pg=0x%x, promote=%d",
+	    "  MAPPING: case2: pm=%p, va=0x%lx, pg=%p, promote=%d",
 	    ufi.orig_map->pmap, ufi.orig_rvaddr, pg, promote);
 	if (pmap_enter(ufi.orig_map->pmap, ufi.orig_rvaddr, VM_PAGE_TO_PHYS(pg),
 	    enter_prot, access_type | PMAP_CANFAIL | (wired ? PMAP_WIRED : 0))
diff --git a/sys/uvm/uvm_km.c b/sys/uvm/uvm_km.c
index 0a0c0c79258..5a717831a92 100644
--- a/sys/uvm/uvm_km.c
+++ b/sys/uvm/uvm_km.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_km.c,v 1.50 2006/04/25 08:31:00 mickey Exp $	*/
+/*	$OpenBSD: uvm_km.c,v 1.51 2006/07/26 23:15:55 mickey Exp $	*/
 /*	$NetBSD: uvm_km.c,v 1.42 2001/01/14 02:10:01 thorpej Exp $	*/
 
 /* 
@@ -332,7 +332,7 @@ uvm_km_pgremove(uobj, start, end)
 		if (pp == NULL)
 			continue;
 
-		UVMHIST_LOG(maphist,"  page 0x%x, busy=%d", pp,
+		UVMHIST_LOG(maphist,"  page %p, busy=%d", pp,
 		    pp->flags & PG_BUSY, 0, 0);
 
 		/* now do the actual work */
@@ -363,7 +363,7 @@ loop_by_list:
 			continue;
 		}
 
-		UVMHIST_LOG(maphist,"  page 0x%x, busy=%d", pp,
+		UVMHIST_LOG(maphist,"  page %p, busy=%d", pp,
 		    pp->flags & PG_BUSY, 0, 0);
 
 		if (pp->flags & PG_BUSY) {
@@ -425,7 +425,7 @@ uvm_km_pgremove_intrsafe(uobj, start, end)
 			continue;
 		}
 
-		UVMHIST_LOG(maphist,"  page 0x%x, busy=%d", pp,
+		UVMHIST_LOG(maphist,"  page %p, busy=%d", pp,
 		    pp->flags & PG_BUSY, 0, 0);
 		KASSERT((pp->flags & PG_BUSY) == 0);
 		KASSERT((pp->pqflags & PQ_ACTIVE) == 0);
@@ -443,7 +443,7 @@ loop_by_list:
 			continue;
 		}
 
-		UVMHIST_LOG(maphist,"  page 0x%x, busy=%d", pp,
+		UVMHIST_LOG(maphist,"  page %p, busy=%d", pp,
 		    pp->flags & PG_BUSY, 0, 0);
 		KASSERT((pp->flags & PG_BUSY) == 0);
 		KASSERT((pp->pqflags & PQ_ACTIVE) == 0);
@@ -478,7 +478,7 @@ uvm_km_kmemalloc(map, obj, size, flags)
 	struct vm_page *pg;
 	UVMHIST_FUNC("uvm_km_kmemalloc"); UVMHIST_CALLED(maphist);
 
-	UVMHIST_LOG(maphist,"  (map=0x%x, obj=0x%x, size=0x%x, flags=%d)",
+	UVMHIST_LOG(maphist,"  (map=%p, obj=%p, size=0x%lx, flags=%d)",
 		    map, obj, size, flags);
 	KASSERT(vm_map_pmap(map) == pmap_kernel());
 
@@ -506,7 +506,7 @@ uvm_km_kmemalloc(map, obj, size, flags)
 	 */
 
 	if (flags & UVM_KMF_VALLOC) {
-		UVMHIST_LOG(maphist,"<- done valloc (kva=0x%x)", kva,0,0,0);
+		UVMHIST_LOG(maphist,"<- done valloc (kva=0x%lx)", kva,0,0,0);
 		return(kva);
 	}
 
@@ -515,7 +515,7 @@ uvm_km_kmemalloc(map, obj, size, flags)
 	 */
 
 	offset = kva - vm_map_min(kernel_map);
-	UVMHIST_LOG(maphist, "  kva=0x%x, offset=0x%x", kva, offset,0,0);
+	UVMHIST_LOG(maphist, "  kva=0x%lx, offset=0x%lx", kva, offset,0,0);
 
 	/*
 	 * now allocate and map in the memory... note that we are the only ones
@@ -570,7 +570,7 @@ uvm_km_kmemalloc(map, obj, size, flags)
 	}
 	pmap_update(pmap_kernel());
 
-	UVMHIST_LOG(maphist,"<- done (kva=0x%x)", kva,0,0,0);
+	UVMHIST_LOG(maphist,"<- done (kva=0x%lx)", kva,0,0,0);
 	return(kva);
 }
 
@@ -628,7 +628,7 @@ uvm_km_alloc1(map, size, zeroit)
 	struct vm_page *pg;
 	UVMHIST_FUNC("uvm_km_alloc1"); UVMHIST_CALLED(maphist);
 
-	UVMHIST_LOG(maphist,"(map=0x%x, size=0x%x)", map, size,0,0);
+	UVMHIST_LOG(maphist,"(map=%p, size=0x%lx)", map, size,0,0);
 	KASSERT(vm_map_pmap(map) == pmap_kernel());
 
 	size = round_page(size);
@@ -651,7 +651,7 @@ uvm_km_alloc1(map, size, zeroit)
 	 */
 
 	offset = kva - vm_map_min(kernel_map);
-	UVMHIST_LOG(maphist,"  kva=0x%x, offset=0x%x", kva, offset,0,0);
+	UVMHIST_LOG(maphist,"  kva=0x%lx, offset=0x%lx", kva, offset,0,0);
 
 	/*
 	 * now allocate the memory.  we must be careful about released pages.
@@ -708,7 +708,7 @@ uvm_km_alloc1(map, size, zeroit)
 	if (zeroit)
 		memset((caddr_t)kva, 0, loopva - kva);
 
-	UVMHIST_LOG(maphist,"<- done (kva=0x%x)", kva,0,0,0);
+	UVMHIST_LOG(maphist,"<- done (kva=0x%lx)", kva,0,0,0);
 	return(kva);
 }
 
@@ -735,7 +735,7 @@ uvm_km_valloc_align(map, size, align)
 	vaddr_t kva;
 	UVMHIST_FUNC("uvm_km_valloc"); UVMHIST_CALLED(maphist);
 
-	UVMHIST_LOG(maphist, "(map=0x%x, size=0x%x)", map, size, 0,0);
+	UVMHIST_LOG(maphist, "(map=%p, size=0x%lx)", map, size, 0,0);
 	KASSERT(vm_map_pmap(map) == pmap_kernel());
 
 	size = round_page(size);
@@ -753,7 +753,7 @@ uvm_km_valloc_align(map, size, align)
 		return(0);
 	}
 
-	UVMHIST_LOG(maphist, "<- done (kva=0x%x)", kva,0,0,0);
+	UVMHIST_LOG(maphist, "<- done (kva=0x%lx)", kva,0,0,0);
 	return(kva);
 }
 
@@ -774,7 +774,7 @@ uvm_km_valloc_prefer_wait(map, size, prefer)
 	vaddr_t kva;
 	UVMHIST_FUNC("uvm_km_valloc_prefer_wait"); UVMHIST_CALLED(maphist);
 
-	UVMHIST_LOG(maphist, "(map=0x%x, size=0x%x)", map, size, 0,0);
+	UVMHIST_LOG(maphist, "(map=%p, size=0x%lx)", map, size, 0,0);
 	KASSERT(vm_map_pmap(map) == pmap_kernel());
 
 	size = round_page(size);
@@ -793,7 +793,7 @@ uvm_km_valloc_prefer_wait(map, size, prefer)
 		    prefer, 0, UVM_MAPFLAG(UVM_PROT_ALL,
 		    UVM_PROT_ALL, UVM_INH_NONE, UVM_ADV_RANDOM, 0))
 		    == KERN_SUCCESS)) {
-			UVMHIST_LOG(maphist,"<- done (kva=0x%x)", kva,0,0,0);
+			UVMHIST_LOG(maphist,"<- done (kva=0x%lx)", kva,0,0,0);
 			return(kva);
 		}
 
diff --git a/sys/uvm/uvm_map.c b/sys/uvm/uvm_map.c
index bb7bedfda20..2267e287402 100644
--- a/sys/uvm/uvm_map.c
+++ b/sys/uvm/uvm_map.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_map.c,v 1.80 2006/07/13 22:51:26 deraadt Exp $	*/
+/*	$OpenBSD: uvm_map.c,v 1.81 2006/07/26 23:15:55 mickey Exp $	*/
 /*	$NetBSD: uvm_map.c,v 1.86 2000/11/27 08:40:03 chs Exp $	*/
 
 /* 
@@ -426,7 +426,7 @@ uvm_mapent_alloc(struct vm_map *map)
 		me->flags = 0;
 	}
 
-	UVMHIST_LOG(maphist, "<- new entry=0x%x [kentry=%d]", me,
+	UVMHIST_LOG(maphist, "<- new entry=%p [kentry=%d]", me,
 	    ((map->flags & VM_MAP_INTRSAFE) != 0 || map == kernel_map), 0, 0);
 	return(me);
 }
@@ -443,7 +443,7 @@ uvm_mapent_free(struct vm_map_entry *me)
 	int s;
 	UVMHIST_FUNC("uvm_mapent_free"); UVMHIST_CALLED(maphist);
 
-	UVMHIST_LOG(maphist,"<- freeing map entry=0x%x [flags=%d]",
+	UVMHIST_LOG(maphist,"<- freeing map entry=%p [flags=%d]",
 		me, me->flags, 0, 0);
 	if (me->flags & UVM_MAP_STATIC) {
 		s = splvm();
@@ -736,9 +736,9 @@ uvm_map_p(map, startp, size, uobj, uoffset, align, flags, p)
 	UVMHIST_FUNC("uvm_map");
 	UVMHIST_CALLED(maphist);
 
-	UVMHIST_LOG(maphist, "(map=0x%x, *startp=0x%x, size=%d, flags=0x%x)",
+	UVMHIST_LOG(maphist, "(map=%p, *startp=0x%lx, size=%ld, flags=0x%x)",
 	    map, *startp, size, flags);
-	UVMHIST_LOG(maphist, "  uobj/offset 0x%x/%d", uobj, uoffset,0,0);
+	UVMHIST_LOG(maphist, "  uobj/offset %p/%lld", uobj, uoffset,0,0);
 
 	uvm_tree_sanity(map, "map entry");
 
@@ -748,7 +748,7 @@ uvm_map_p(map, startp, size, uobj, uoffset, align, flags, p)
 
 	if ((prot & maxprot) != prot) {
 		UVMHIST_LOG(maphist, "<- prot. failure:  prot=0x%x, max=0x%x", 
-		prot, maxprot,0,0);
+		    prot, maxprot,0,0);
 		return(KERN_PROTECTION_FAILURE);
 	}
 
@@ -975,7 +975,7 @@ uvm_map_lookup_entry(map, address, entry)
 	UVMHIST_FUNC("uvm_map_lookup_entry");
 	UVMHIST_CALLED(maphist);
 
-	UVMHIST_LOG(maphist,"(map=0x%x,addr=0x%x,ent=0x%x)",
+	UVMHIST_LOG(maphist,"(map=%p,addr=0x%lx,ent=%p)",
 	    map, address, entry, 0);
 
 	/*
@@ -1007,7 +1007,7 @@ uvm_map_lookup_entry(map, address, entry)
 		if ((cur != last) && (cur->end > address)) {
 			UVMCNT_INCR(uvm_mlk_hint);
 			*entry = cur;
-			UVMHIST_LOG(maphist,"<- got it via hint (0x%x)",
+			UVMHIST_LOG(maphist,"<- got it via hint (%p)",
 			    cur, 0, 0, 0);
 			return (TRUE);
 		}
@@ -1064,7 +1064,7 @@ uvm_map_lookup_entry(map, address, entry)
 
 				*entry = cur;
 				SAVE_HINT(map, map->hint, cur);
-				UVMHIST_LOG(maphist,"<- search got it (0x%x)",
+				UVMHIST_LOG(maphist,"<- search got it (%p)",
 					cur, 0, 0, 0);
 				return (TRUE);
 			}
@@ -1176,7 +1176,7 @@ uvm_map_findspace(map, hint, length, result, uobj, uoffset, align, flags)
 	UVMHIST_FUNC("uvm_map_findspace");
 	UVMHIST_CALLED(maphist);
 
-	UVMHIST_LOG(maphist, "(map=0x%x, hint=0x%x, len=%d, flags=0x%x)", 
+	UVMHIST_LOG(maphist, "(map=%p, hint=0x%lx, len=%ld, flags=0x%x)", 
 		    map, hint, length, flags);
 	KASSERT((align & (align - 1)) == 0);
 	KASSERT((flags & UVM_FLAG_FIXED) == 0 || align == 0);
@@ -1198,7 +1198,7 @@ uvm_map_findspace(map, hint, length, result, uobj, uoffset, align, flags)
 		hint = map->min_offset;
 	}
 	if (hint > map->max_offset) {
-		UVMHIST_LOG(maphist,"<- VA 0x%x > range [0x%x->0x%x]",
+		UVMHIST_LOG(maphist,"<- VA 0x%lx > range [0x%lx->0x%lx]",
 				hint, map->min_offset, map->max_offset, 0);
 		return(NULL);
 	}
@@ -1363,7 +1363,7 @@ uvm_map_findspace(map, hint, length, result, uobj, uoffset, align, flags)
  found:
 	SAVE_HINT(map, map->hint, entry);
 	*result = hint;
-	UVMHIST_LOG(maphist,"<- got it!  (result=0x%x)", hint, 0,0,0);
+	UVMHIST_LOG(maphist,"<- got it!  (result=0x%lx)", hint, 0,0,0);
 	return (entry);
 
  error:
@@ -1402,7 +1402,7 @@ uvm_unmap_remove(map, start, end, entry_list, p)
 	UVMHIST_FUNC("uvm_unmap_remove");
 	UVMHIST_CALLED(maphist);
 
-	UVMHIST_LOG(maphist,"(map=0x%x, start=0x%x, end=0x%x)",
+	UVMHIST_LOG(maphist,"(map=%p, start=0x%lx, end=0x%lx)",
 	    map, start, end, 0);
 
 	VM_MAP_RANGE_CHECK(map, start, end);
@@ -1544,7 +1544,7 @@ uvm_unmap_remove(map, start, end, entry_list, p)
 		 * remove entry from map and put it on our list of entries 
 		 * that we've nuked.  then go do next entry.
 		 */
-		UVMHIST_LOG(maphist, "  removed map entry 0x%x", entry, 0, 0,0);
+		UVMHIST_LOG(maphist, "  removed map entry %p", entry, 0, 0,0);
 
 		/* critical! prevents stale hint */
 		SAVE_HINT(map, entry, entry->prev);
@@ -1588,7 +1588,7 @@ uvm_unmap_detach(first_entry, flags)
 	while (first_entry) {
 		KASSERT(!VM_MAPENT_ISWIRED(first_entry));
 		UVMHIST_LOG(maphist,
-		    "  detach 0x%x: amap=0x%x, obj=0x%x, submap?=%d", 
+		    "  detach 0x%x: amap=%p, obj=%p, submap?=%d", 
 		    first_entry, first_entry->aref.ar_amap, 
 		    first_entry->object.uvm_obj,
 		    UVM_ET_ISSUBMAP(first_entry));
@@ -1645,7 +1645,7 @@ uvm_map_reserve(map, size, offset, align, raddr)
 {
 	UVMHIST_FUNC("uvm_map_reserve"); UVMHIST_CALLED(maphist); 
 
-	UVMHIST_LOG(maphist, "(map=0x%x, size=0x%x, offset=0x%x,addr=0x%x)",
+	UVMHIST_LOG(maphist, "(map=%p, size=0x%lx, offset=0x%lx,addr=0x%lx)",
 	      map,size,offset,raddr);
 
 	size = round_page(size);
@@ -1663,7 +1663,7 @@ uvm_map_reserve(map, size, offset, align, raddr)
 		return (FALSE);
 	}     
 
-	UVMHIST_LOG(maphist, "<- done (*raddr=0x%x)", *raddr,0,0,0);
+	UVMHIST_LOG(maphist, "<- done (*raddr=0x%lx)", *raddr,0,0,0);
 	return (TRUE);
 }
 
@@ -1828,9 +1828,9 @@ uvm_map_extract(srcmap, start, len, dstmap, dstaddrp, flags)
 	int nchain, error, copy_ok;
 	UVMHIST_FUNC("uvm_map_extract"); UVMHIST_CALLED(maphist);
 
-	UVMHIST_LOG(maphist,"(srcmap=0x%x,start=0x%x, len=0x%x", srcmap, start,
+	UVMHIST_LOG(maphist,"(srcmap=%p,start=0x%lx, len=0x%lx", srcmap, start,
 	    len,0);
-	UVMHIST_LOG(maphist," ...,dstmap=0x%x, flags=0x%x)", dstmap,flags,0,0);
+	UVMHIST_LOG(maphist," ...,dstmap=%p, flags=0x%x)", dstmap,flags,0,0);
 
 	uvm_tree_sanity(srcmap, "map_extract src enter");
 	uvm_tree_sanity(dstmap, "map_extract dst enter");
@@ -1853,7 +1853,7 @@ uvm_map_extract(srcmap, start, len, dstmap, dstaddrp, flags)
 	if (uvm_map_reserve(dstmap, len, start, 0, &dstaddr) == FALSE)
 		return(ENOMEM);
 	*dstaddrp = dstaddr;	/* pass address back to caller */
-	UVMHIST_LOG(maphist, "  dstaddr=0x%x", dstaddr,0,0,0);
+	UVMHIST_LOG(maphist, "  dstaddr=0x%lx", dstaddr,0,0,0);
 
 	/*
 	 * step 2: setup for the extraction process loop by init'ing the 
@@ -2212,7 +2212,7 @@ uvm_map_protect(map, start, end, new_prot, set_max)
 	vm_map_entry_t current, entry;
 	int rv = KERN_SUCCESS;
 	UVMHIST_FUNC("uvm_map_protect"); UVMHIST_CALLED(maphist);
-	UVMHIST_LOG(maphist,"(map=0x%x,start=0x%x,end=0x%x,new_prot=0x%x)",
+	UVMHIST_LOG(maphist,"(map=%p,start=0x%lx,end=0x%lx,new_prot=0x%x)",
 		    map, start, end, new_prot);
 
 	vm_map_lock(map);
@@ -2332,7 +2332,7 @@ uvm_map_inherit(map, start, end, new_inheritance)
 {
 	vm_map_entry_t entry, temp_entry;
 	UVMHIST_FUNC("uvm_map_inherit"); UVMHIST_CALLED(maphist);
-	UVMHIST_LOG(maphist,"(map=0x%x,start=0x%x,end=0x%x,new_inh=0x%x)",
+	UVMHIST_LOG(maphist,"(map=%p,start=0x%lx,end=0x%lx,new_inh=0x%x)",
 	    map, start, end, new_inheritance);
 
 	switch (new_inheritance) {
@@ -2382,7 +2382,7 @@ uvm_map_advice(map, start, end, new_advice)
 {
 	vm_map_entry_t entry, temp_entry;
 	UVMHIST_FUNC("uvm_map_advice"); UVMHIST_CALLED(maphist);
-	UVMHIST_LOG(maphist,"(map=0x%x,start=0x%x,end=0x%x,new_adv=0x%x)",
+	UVMHIST_LOG(maphist,"(map=%p,start=0x%lx,end=0x%lx,new_adv=0x%x)",
 	    map, start, end, new_advice);
 
 	vm_map_lock(map);
@@ -2449,7 +2449,7 @@ uvm_map_pageable(map, start, end, new_pageable, lockflags)
 	u_int timestamp_save;
 #endif
 	UVMHIST_FUNC("uvm_map_pageable"); UVMHIST_CALLED(maphist);
-	UVMHIST_LOG(maphist,"(map=0x%x,start=0x%x,end=0x%x,new_pageable=0x%x)",
+	UVMHIST_LOG(maphist,"(map=%p,start=0x%lx,end=0x%lx,new_pageable=0x%x)",
 		    map, start, end, new_pageable);
 	KASSERT(map->flags & VM_MAP_PAGEABLE);
 
@@ -2703,7 +2703,7 @@ uvm_map_pageable_all(map, flags, limit)
 	u_int timestamp_save;
 #endif
 	UVMHIST_FUNC("uvm_map_pageable_all"); UVMHIST_CALLED(maphist);
-	UVMHIST_LOG(maphist,"(map=0x%x,flags=0x%x)", map, flags, 0, 0);
+	UVMHIST_LOG(maphist,"(map=%p,flags=0x%x)", map, flags, 0, 0);
 
 	KASSERT(map->flags & VM_MAP_PAGEABLE);
 
@@ -2937,7 +2937,7 @@ uvm_map_clean(map, start, end, flags)
 	int rv, error, refs;
 	UVMHIST_FUNC("uvm_map_clean"); UVMHIST_CALLED(maphist);
 
-	UVMHIST_LOG(maphist,"(map=0x%x,start=0x%x,end=0x%x,flags=0x%x)",
+	UVMHIST_LOG(maphist,"(map=%p,start=0x%lx,end=0x%lx,flags=0x%x)",
 		    map, start, end, flags);
 	KASSERT((flags & (PGO_FREE|PGO_DEACTIVATE)) !=
 		(PGO_FREE|PGO_DEACTIVATE));
@@ -3178,7 +3178,7 @@ uvmspace_alloc(min, max, pageable)
 
 	vm = pool_get(&uvm_vmspace_pool, PR_WAITOK);
 	uvmspace_init(vm, NULL, min, max, pageable);
-	UVMHIST_LOG(maphist,"<- done (vm=0x%x)", vm,0,0,0);
+	UVMHIST_LOG(maphist,"<- done (vm=%p)", vm,0,0,0);
 	return (vm);
 }
 
@@ -3348,7 +3348,7 @@ uvmspace_free(vm)
 	vm_map_entry_t dead_entries;
 	UVMHIST_FUNC("uvmspace_free"); UVMHIST_CALLED(maphist);
 
-	UVMHIST_LOG(maphist,"(vm=0x%x) ref=%d", vm, vm->vm_refcnt,0,0);
+	UVMHIST_LOG(maphist,"(vm=%p) ref=%d", vm, vm->vm_refcnt,0,0);
 	if (--vm->vm_refcnt == 0) {
 		/*
 		 * lock the map, to wait out all other references to it.  delete
diff --git a/sys/uvm/uvm_map_i.h b/sys/uvm/uvm_map_i.h
index 8927c6dfb73..3e51b8509d4 100644
--- a/sys/uvm/uvm_map_i.h
+++ b/sys/uvm/uvm_map_i.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_map_i.h,v 1.17 2005/05/24 21:11:47 tedu Exp $	*/
+/*	$OpenBSD: uvm_map_i.h,v 1.18 2006/07/26 23:15:55 mickey Exp $	*/
 /*	$NetBSD: uvm_map_i.h,v 1.18 2000/11/27 08:40:04 chs Exp $	*/
 
 /* 
@@ -169,7 +169,7 @@ uvm_unmap_p(map, start, end, p)
 	vm_map_entry_t dead_entries;
 	UVMHIST_FUNC("uvm_unmap"); UVMHIST_CALLED(maphist);
 
-	UVMHIST_LOG(maphist, "  (map=0x%x, start=0x%x, end=0x%x)",
+	UVMHIST_LOG(maphist, "  (map=%p, start=0x%lx, end=0x%lx)",
 	    map, start, end, 0);
 	/*
 	 * work now done by helper functions.   wipe the pmap's and then
diff --git a/sys/uvm/uvm_page.c b/sys/uvm/uvm_page.c
index c38afca8159..fe4990d4a3e 100644
--- a/sys/uvm/uvm_page.c
+++ b/sys/uvm/uvm_page.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_page.c,v 1.54 2006/07/13 22:51:26 deraadt Exp $	*/
+/*	$OpenBSD: uvm_page.c,v 1.55 2006/07/26 23:15:55 mickey Exp $	*/
 /*	$NetBSD: uvm_page.c,v 1.44 2000/11/27 08:40:04 chs Exp $	*/
 
 /* 
@@ -968,8 +968,8 @@ uvm_pagealloc_strat(obj, off, anon, flags, strat, free_list)
 		try2 = PGFL_ZEROS;
 	}
 
-	UVMHIST_LOG(pghist, "obj=%p off=%llx anon=%x flags=%x",
-	    obj, off, flags, anon);
+	UVMHIST_LOG(pghist, "obj=%p off=%llx anon=%p flags=%x",
+	    obj, off, anon, flags);
 	UVMHIST_LOG(pghist, "strat=%d free_list=%d", strat, free_list, 0, 0);
  again:
 	switch (strat) {
diff --git a/sys/uvm/uvm_pager.c b/sys/uvm/uvm_pager.c
index 04fbfcb6801..ceeb0404f29 100644
--- a/sys/uvm/uvm_pager.c
+++ b/sys/uvm/uvm_pager.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_pager.c,v 1.37 2005/07/26 07:11:55 art Exp $	*/
+/*	$OpenBSD: uvm_pager.c,v 1.38 2006/07/26 23:15:55 mickey Exp $	*/
 /*	$NetBSD: uvm_pager.c,v 1.36 2000/11/27 18:26:41 chs Exp $	*/
 
 /*
@@ -124,7 +124,7 @@ uvm_pagermapin(pps, npages, flags)
 	vm_prot_t prot;
 	UVMHIST_FUNC("uvm_pagermapin"); UVMHIST_CALLED(maphist);
 
-	UVMHIST_LOG(maphist,"(pps=0x%x, npages=%d)", pps, npages,0,0);
+	UVMHIST_LOG(maphist,"(pps=%p, npages=%d)", pps, npages,0,0);
 
 	/*
 	 * compute protection.  outgoing I/O only needs read
@@ -178,7 +178,7 @@ enter:
 	}
 	pmap_update(vm_map_pmap(pager_map));
 
-	UVMHIST_LOG(maphist, "<- done (KVA=0x%x)", kva,0,0,0);
+	UVMHIST_LOG(maphist, "<- done (KVA=0x%lx)", kva,0,0,0);
 	return(kva);
 }
 
@@ -198,7 +198,7 @@ uvm_pagermapout(kva, npages)
 	vm_map_entry_t entries;
 	UVMHIST_FUNC("uvm_pagermapout"); UVMHIST_CALLED(maphist);
 
-	UVMHIST_LOG(maphist, " (kva=0x%x, npages=%d)", kva, npages,0,0);
+	UVMHIST_LOG(maphist, " (kva=0x%lx, npages=%d)", kva, npages,0,0);
 
 	/*
 	 * duplicate uvm_unmap, but add in pager_map_wanted handling.
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);
diff --git a/sys/uvm/uvm_vnode.c b/sys/uvm/uvm_vnode.c
index 22fc0c2b748..8ff5e3e3ea5 100644
--- a/sys/uvm/uvm_vnode.c
+++ b/sys/uvm/uvm_vnode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_vnode.c,v 1.41 2006/06/10 13:37:02 pedro Exp $	*/
+/*	$OpenBSD: uvm_vnode.c,v 1.42 2006/07/26 23:15:55 mickey Exp $	*/
 /*	$NetBSD: uvm_vnode.c,v 1.36 2000/11/24 20:34:01 chs Exp $	*/
 
 /*
@@ -167,7 +167,7 @@ uvn_attach(arg, accessprot)
 	u_quad_t used_vnode_size;
 	UVMHIST_FUNC("uvn_attach"); UVMHIST_CALLED(maphist);
 
-	UVMHIST_LOG(maphist, "(vn=0x%x)", arg,0,0,0);
+	UVMHIST_LOG(maphist, "(vn=%p)", arg,0,0,0);
 
 	used_vnode_size = (u_quad_t)0;	/* XXX gcc -Wuninitialized */
 
@@ -313,7 +313,7 @@ uvn_attach(arg, accessprot)
 	if (oldflags & UVM_VNODE_WANTED)
 		wakeup(uvn);
 
-	UVMHIST_LOG(maphist,"<- done/VREF, ret 0x%x", &uvn->u_obj,0,0,0);
+	UVMHIST_LOG(maphist,"<- done/VREF, ret %p", &uvn->u_obj,0,0,0);
 	return(&uvn->u_obj);
 }
 
@@ -348,8 +348,8 @@ uvn_reference(uobj)
 	}
 #endif
 	uobj->uo_refs++;
-	UVMHIST_LOG(maphist, "<- done (uobj=0x%x, ref = %d)",
-	uobj, uobj->uo_refs,0,0);
+	UVMHIST_LOG(maphist, "<- done (uobj=%p, ref = %d)",
+	    uobj, uobj->uo_refs,0,0);
 	simple_unlock(&uobj->vmobjlock);
 }
 
@@ -373,7 +373,7 @@ uvn_detach(uobj)
 
 	simple_lock(&uobj->vmobjlock);
 
-	UVMHIST_LOG(maphist,"  (uobj=0x%x)  ref=%d", uobj,uobj->uo_refs,0,0);
+	UVMHIST_LOG(maphist,"  (uobj=%p)  ref=%d", uobj,uobj->uo_refs,0,0);
 	uobj->uo_refs--;			/* drop ref! */
 	if (uobj->uo_refs) {			/* still more refs */
 		simple_unlock(&uobj->vmobjlock);
@@ -529,7 +529,7 @@ uvm_vnp_terminate(vp)
 	 * lock object and check if it is valid
 	 */
 	simple_lock(&uvn->u_obj.vmobjlock);
-	UVMHIST_LOG(maphist, "  vp=0x%x, ref=%d, flag=0x%x", vp,
+	UVMHIST_LOG(maphist, "  vp=%p, ref=%d, flag=0x%x", vp,
 	    uvn->u_obj.uo_refs, uvn->u_flags, 0);
 	if ((uvn->u_flags & UVM_VNODE_VALID) == 0) {
 		simple_unlock(&uvn->u_obj.vmobjlock);
@@ -853,7 +853,7 @@ uvn_flush(uobj, start, stop, flags)
 	}
 
 	UVMHIST_LOG(maphist,
-	    " flush start=0x%x, stop=0x%x, by_list=%d, flags=0x%x",
+	    " flush start=0x%llx, stop=0x%llx, by_list=%d, flags=0x%x",
 	    start, stop, by_list, flags);
 
 	/*