4 files changed, 23 insertions, 17 deletions

diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 41a133ea4c4b..3f9feed5f61a 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -39,7 +39,7 @@
  * from: Utah $Hdr: swap_pager.c 1.4 91/04/30$
  *
  *	@(#)swap_pager.c	8.9 (Berkeley) 3/21/94
- * $Id: swap_pager.c,v 1.95 1998/05/04 03:01:42 dyson Exp $
+ * $Id: swap_pager.c,v 1.96 1998/07/04 20:45:41 julian Exp $
  */
 
 /*
@@ -1070,14 +1070,17 @@ swap_pager_getpages(object, m, count, reqpage)
 	s = splvm();
 	while ((bp->b_flags & B_DONE) == 0) {
 		if (tsleep(bp, PVM, "swread", hz*20)) {
-			printf("swap_pager: indefinite wait buffer: device: %#x, blkno: %d, size: %d\n",
-				bp->b_dev, bp->b_blkno, bp->b_bcount);
+			printf(
+"swap_pager: indefinite wait buffer: device: %#lx, blkno: %ld, size: %ld\n",
+			    (u_long)bp->b_dev, (long)bp->b_blkno,
+			    (long)bp->b_bcount);
 		}
 	}
 
 	if (bp->b_flags & B_ERROR) {
-		printf("swap_pager: I/O error - pagein failed; blkno %d, size %d, error %d\n",
-		    bp->b_blkno, bp->b_bcount, bp->b_error);
+		printf(
+"swap_pager: I/O error - pagein failed; blkno %ld, size %ld, error %d\n",
+		    (long)bp->b_blkno, (long)bp->b_bcount, bp->b_error);
 		rv = VM_PAGER_ERROR;
 	} else {
 		rv = VM_PAGER_OK;
@@ -1486,8 +1489,9 @@ swap_pager_putpages(object, m, count, sync, rtvals)
 	}
 
 	if (bp->b_flags & B_ERROR) {
-		printf("swap_pager: I/O error - pageout failed; blkno %d, size %d, error %d\n",
-		    bp->b_blkno, bp->b_bcount, bp->b_error);
+		printf(
+"swap_pager: I/O error - pageout failed; blkno %ld, size %ld, error %d\n",
+		    (long)bp->b_blkno, (long)bp->b_bcount, bp->b_error);
 		rv = VM_PAGER_ERROR;
 	} else {
 		rv = VM_PAGER_OK;
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index c28c2892ebdf..f8cdc5a49a9d 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_map.c,v 1.128 1998/06/07 17:13:10 dfr Exp $
+ * $Id: vm_map.c,v 1.129 1998/06/21 14:53:43 bde Exp $
  */
 
 /*
@@ -2929,8 +2929,9 @@ DB_SHOW_COMMAND(procvm, procvm)
 		p = curproc;
 	}
 
-	printf("p = 0x%x, vmspace = 0x%x, map = 0x%x, pmap = 0x%x\n",
-		p, p->p_vmspace, &p->p_vmspace->vm_map, &p->p_vmspace->vm_pmap);
+	db_printf("p = %p, vmspace = %p, map = %p, pmap = %p\n",
+	    (void *)p, (void *)p->p_vmspace, (void *)&p->p_vmspace->vm_map,
+	    (void *)&p->p_vmspace->vm_pmap);
 
 	vm_map_print ((long) &p->p_vmspace->vm_map, 1, 0, NULL);
 }
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index ae412e06adab..bedfaf9a6a36 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_page.c	7.4 (Berkeley) 5/7/91
- *	$Id: vm_page.c,v 1.101 1998/06/07 17:13:13 dfr Exp $
+ *	$Id: vm_page.c,v 1.102 1998/06/21 18:02:48 bde Exp $
  */
 
 /*
@@ -1072,9 +1072,10 @@ vm_page_freechk_and_unqueue(m)
 #if !defined(MAX_PERF)
 	if (m->busy || ((m->queue - m->pc) == PQ_FREE) ||
 		(m->hold_count != 0)) {
-		printf("vm_page_free: pindex(%ld), busy(%d), PG_BUSY(%d), hold(%d)\n",
-			m->pindex, m->busy,
-			(m->flags & PG_BUSY) ? 1 : 0, m->hold_count);
+		printf(
+		"vm_page_free: pindex(%lu), busy(%d), PG_BUSY(%d), hold(%d)\n",
+		    (u_long)m->pindex, m->busy, (m->flags & PG_BUSY) ? 1 : 0,
+		    m->hold_count);
 		if ((m->queue - m->pc) == PQ_FREE)
 			panic("vm_page_free: freeing free page");
 		else
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index 527e82589868..3fb323c0d68e 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vnode_pager.c	7.5 (Berkeley) 4/20/91
- *	$Id: vnode_pager.c,v 1.91 1998/03/16 01:56:03 dyson Exp $
+ *	$Id: vnode_pager.c,v 1.92 1998/07/04 20:45:42 julian Exp $
  */
 
 /*
@@ -903,8 +903,8 @@ vnode_pager_generic_putpages(vp, m, bytecount, flags, rtvals)
 		printf("vnode_pager_putpages: I/O error %d\n", error);
 	}
 	if (auio.uio_resid) {
-		printf("vnode_pager_putpages: residual I/O %d at %ld\n",
-			auio.uio_resid, m[0]->pindex);
+		printf("vnode_pager_putpages: residual I/O %d at %lu\n",
+		    auio.uio_resid, (u_long)m[0]->pindex);
 	}
 	for (i = 0; i < ncount; i++) {
 		rtvals[i] = VM_PAGER_OK;