Fix a few format string bugs with -DDEBUG

6 files changed, 14 insertions, 14 deletions

diff --git a/sys/arch/amd64/amd64/disksubr.c b/sys/arch/amd64/amd64/disksubr.c
index b90d5da342e..e2f1c1a5e61 100644
--- a/sys/arch/amd64/amd64/disksubr.c
+++ b/sys/arch/amd64/amd64/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.65 2013/10/19 09:32:12 krw Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.66 2014/06/15 11:43:24 sf Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -76,7 +76,7 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 	    RAW_PART));
 	if (pdi != NULL && pdi->bios_heads > 0 && pdi->bios_sectors > 0) {
 #ifdef DEBUG
-		printf("Disk GEOM %u/%u/%u -> BIOS GEOM %u/%u/%u\n",
+		printf("Disk GEOM %u/%u/%u -> BIOS GEOM %u/%u/%llu\n",
 		    lp->d_ntracks, lp->d_nsectors, lp->d_ncylinders,
 		    pdi->bios_heads, pdi->bios_sectors,
 		    DL_GETDSIZE(lp) / (pdi->bios_heads * pdi->bios_sectors));
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c
index b4fb77e2ab3..77c1a645824 100644
--- a/sys/arch/amd64/amd64/machdep.c
+++ b/sys/arch/amd64/amd64/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.179 2014/05/31 15:49:28 mpi Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.180 2014/06/15 11:43:24 sf Exp $	*/
 /*	$NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $	*/
 
 /*-
@@ -616,7 +616,7 @@ sendsig(sig_t catcher, int sig, int mask, u_long code, int type,
 
 #ifdef DEBUG
 	if ((sigdebug & SDB_FOLLOW) && (!sigpid || p->p_pid == sigpid))
-		printf("sendsig(%d): pc 0x%x, catcher 0x%x\n", p->p_pid,
+		printf("sendsig(%d): pc 0x%llx, catcher 0x%llx\n", p->p_pid,
 		    tf->tf_rip, tf->tf_rax);
 #endif
 }
diff --git a/sys/arch/amd64/amd64/pmap.c b/sys/arch/amd64/amd64/pmap.c
index b35066d202f..da0e70b754e 100644
--- a/sys/arch/amd64/amd64/pmap.c
+++ b/sys/arch/amd64/amd64/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.69 2014/03/27 10:24:40 dlg Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.70 2014/06/15 11:43:24 sf Exp $	*/
 /*	$NetBSD: pmap.c,v 1.3 2003/05/08 18:13:13 thorpej Exp $	*/
 
 /*
@@ -2379,7 +2379,7 @@ pmap_dump(struct pmap *pmap, vaddr_t sva, vaddr_t eva)
 		for (/* null */; sva < blkendva ; sva += PAGE_SIZE, pte++) {
 			if (!pmap_valid_entry(*pte))
 				continue;
-			printf("va %#lx -> pa %#lx (pte=%#lx)\n",
+			printf("va %#lx -> pa %#llx (pte=%#llx)\n",
 			       sva, *pte, *pte & PG_FRAME);
 		}
 	}
diff --git a/sys/arch/amd64/amd64/trap.c b/sys/arch/amd64/amd64/trap.c
index 590f68c01cb..5c336f7704a 100644
--- a/sys/arch/amd64/amd64/trap.c
+++ b/sys/arch/amd64/amd64/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.39 2014/05/11 00:12:43 guenther Exp $	*/
+/*	$OpenBSD: trap.c,v 1.40 2014/06/15 11:43:24 sf Exp $	*/
 /*	$NetBSD: trap.c,v 1.2 2003/05/04 23:51:56 fvdl Exp $	*/
 
 /*-
@@ -162,8 +162,8 @@ trap(struct trapframe *frame)
 
 #ifdef DEBUG
 	if (trapdebug) {
-		printf("trap %d code %lx rip %lx cs %lx rflags %lx cr2 %lx "
-		       "cpl %x\n",
+		printf("trap %d code %llx rip %llx cs %llx rflags %llx "
+		       "cr2 %llx cpl %x\n",
 		    type, frame->tf_err, frame->tf_rip, frame->tf_cs,
 		    frame->tf_rflags, rcr2(), curcpu()->ci_ilevel);
 		printf("curproc %p\n", curproc);
diff --git a/sys/arch/i386/i386/disksubr.c b/sys/arch/i386/i386/disksubr.c
index 8d0ce0c37b0..6da9f77a7bd 100644
--- a/sys/arch/i386/i386/disksubr.c
+++ b/sys/arch/i386/i386/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.105 2013/10/19 09:32:13 krw Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.106 2014/06/15 11:43:24 sf Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -78,7 +78,7 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 	    RAW_PART));
 	if (pdi != NULL && pdi->bios_heads > 0 && pdi->bios_sectors > 0) {
 #ifdef DEBUG
-		printf("Disk GEOM %u/%u/%u -> BIOS GEOM %u/%u/%u\n",
+		printf("Disk GEOM %u/%u/%u -> BIOS GEOM %u/%u/%llu\n",
 		    lp->d_ntracks, lp->d_nsectors, lp->d_ncylinders,
 		    pdi->bios_heads, pdi->bios_sectors,
 		    DL_GETDSIZE(lp) / (pdi->bios_heads * pdi->bios_sectors));
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index fe8df0f45bb..502895f4e36 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.538 2014/05/31 15:49:28 mpi Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.539 2014/06/15 11:43:24 sf Exp $	*/
 /*	$NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $	*/
 
 /*-
@@ -3301,7 +3301,7 @@ init386(paddr_t first_avail)
 	if (kb > atop(IOM_END)) {
 		paddr_t lim = atop(IOM_END);
 #ifdef DEBUG
-		printf(" %x-%x (<16M)", lim, kb);
+		printf(" %lx-%x (<16M)", lim, kb);
 #endif
 		uvm_page_physload(lim, kb, lim, kb, 0);
 	}
@@ -3318,7 +3318,7 @@ init386(paddr_t first_avail)
 
 		if (a < e) {
 #ifdef DEBUG
-				printf(" %x-%x", a, e);
+				printf(" %lx-%lx", a, e);
 #endif
 				uvm_page_physload(a, e, a, e, 0);
 		}