format string fixes picked up with -Wformat=2

ok deraadt@

5 files changed, 10 insertions, 10 deletions

diff --git a/sys/arch/amd64/amd64/bios.c b/sys/arch/amd64/amd64/bios.c
index 5b16838effa..cbeedf44020 100644
--- a/sys/arch/amd64/amd64/bios.c
+++ b/sys/arch/amd64/amd64/bios.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bios.c,v 1.25 2013/05/30 16:15:01 deraadt Exp $	*/
+/*	$OpenBSD: bios.c,v 1.26 2013/11/19 04:12:17 guenther Exp $	*/
 /*
  * Copyright (c) 2006 Gordon Willem Klok <gklok@cogeco.ca>
  *
@@ -136,7 +136,7 @@ bios_attach(struct device *parent, struct device *self, void *aux)
 		for (; pa < end; pa+= NBPG, va+= NBPG)
 			pmap_kenter_pa(va, pa, VM_PROT_READ);
 
-		printf(": SMBIOS rev. %d.%d @ 0x%lx (%d entries)",
+		printf(": SMBIOS rev. %d.%d @ 0x%x (%d entries)",
 		    hdr->majrev, hdr->minrev, hdr->addr, hdr->count);
 
 		smbiosrev = hdr->majrev * 100 + hdr->minrev;
diff --git a/sys/arch/amd64/amd64/db_disasm.c b/sys/arch/amd64/amd64/db_disasm.c
index 0d09f5a0f63..a6e60eb9a03 100644
--- a/sys/arch/amd64/amd64/db_disasm.c
+++ b/sys/arch/amd64/amd64/db_disasm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_disasm.c,v 1.10 2013/10/02 21:20:22 sf Exp $	*/
+/*	$OpenBSD: db_disasm.c,v 1.11 2013/11/19 04:12:17 guenther Exp $	*/
 /*	$NetBSD: db_disasm.c,v 1.11 1996/05/03 19:41:58 christos Exp $	*/
 
 /* 
@@ -1000,7 +1000,7 @@ db_disasm_esc(db_addr_t loc, int inst, int short_addr, int size, int rex,
 		 * Normal address modes.
 		 */
 		loc = db_read_address(loc, short_addr, regmodrm, rex, &address);
-		db_printf(fp->f_name);
+		db_printf("%s", fp->f_name);
 		switch (fp->f_size) {
 		case SNGL:
 			db_printf("s");
diff --git a/sys/arch/amd64/amd64/identcpu.c b/sys/arch/amd64/amd64/identcpu.c
index d924afb2980..f4ceb6c5588 100644
--- a/sys/arch/amd64/amd64/identcpu.c
+++ b/sys/arch/amd64/amd64/identcpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: identcpu.c,v 1.51 2013/09/26 14:38:51 jsg Exp $	*/
+/*	$OpenBSD: identcpu.c,v 1.52 2013/11/19 04:12:17 guenther Exp $	*/
 /*	$NetBSD: identcpu.c,v 1.1 2003/04/26 18:39:28 fvdl Exp $	*/
 
 /*
@@ -466,7 +466,7 @@ identifycpu(struct cpu_info *ci)
 	printf("%s: %s", ci->ci_dev->dv_xname, mycpu_model);
 
 	if (ci->ci_tsc_freq != 0)
-		printf(", %lu.%02lu MHz", (ci->ci_tsc_freq + 4999) / 1000000,
+		printf(", %llu.%02llu MHz", (ci->ci_tsc_freq + 4999) / 1000000,
 		    ((ci->ci_tsc_freq + 4999) / 10000) % 100);
 
 	if (ci->ci_flags & CPUF_PRIMARY) {
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c
index 2873bedfd2a..12f6372971c 100644
--- a/sys/arch/amd64/amd64/machdep.c
+++ b/sys/arch/amd64/amd64/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.170 2013/11/02 15:02:27 kettenis Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.171 2013/11/19 04:12:17 guenther Exp $	*/
 /*	$NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $	*/
 
 /*-
@@ -1194,7 +1194,7 @@ cpu_init_extents(void)
 		if (extent_alloc_region(iomem_ex, mem_clusters[i].start,
 		    mem_clusters[i].size, EX_NOWAIT)) {
 			/* XXX What should we do? */
-			printf("WARNING: CAN'T ALLOCATE RAM (%lx-%lx)"
+			printf("WARNING: CAN'T ALLOCATE RAM (%llx-%llx)"
 			    " FROM IOMEM EXTENT MAP!\n", mem_clusters[i].start,
 			    mem_clusters[i].start + mem_clusters[i].size - 1);
 		}
diff --git a/sys/arch/amd64/amd64/pmap.c b/sys/arch/amd64/amd64/pmap.c
index ec69b229325..aed4b5921bf 100644
--- a/sys/arch/amd64/amd64/pmap.c
+++ b/sys/arch/amd64/amd64/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.66 2013/11/01 01:09:43 dlg Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.67 2013/11/19 04:12:17 guenther Exp $	*/
 /*	$NetBSD: pmap.c,v 1.3 2003/05/08 18:13:13 thorpej Exp $	*/
 
 /*
@@ -1048,7 +1048,7 @@ pmap_destroy(struct pmap *pmap)
 
 #ifdef DIAGNOSTIC
 	if (pmap->pm_cpus != 0)
-		printf("pmap_destroy: pmap %p cpus=0x%lx\n",
+		printf("pmap_destroy: pmap %p cpus=0x%llx\n",
 		    (void *)pmap, pmap->pm_cpus);
 #endif