From 7d0d2c4f793333beb43e42c8b62ef1d2bc95b159 Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Sat, 20 Dec 2003 20:08:18 +0000
Subject: Pass -Wformat

---
 sys/arch/sparc64/dev/iommu.c            | 6 +++---
 sys/arch/sparc64/dev/psycho.c           | 4 ++--
 sys/arch/sparc64/sparc64/db_interface.c | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'sys/arch/sparc64')

diff --git a/sys/arch/sparc64/dev/iommu.c b/sys/arch/sparc64/dev/iommu.c
index 7b4181a69ac..77a508533eb 100644
--- a/sys/arch/sparc64/dev/iommu.c
+++ b/sys/arch/sparc64/dev/iommu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iommu.c,v 1.33 2003/12/04 21:13:37 miod Exp $	*/
+/*	$OpenBSD: iommu.c,v 1.34 2003/12/20 20:08:17 miod Exp $	*/
 /*	$NetBSD: iommu.c,v 1.47 2002/02/08 20:03:45 eeh Exp $	*/
 
 /*
@@ -1488,7 +1488,7 @@ _iommu_dvmamap_sync(bus_dma_tag_t t, bus_dma_tag_t t0, bus_dmamap_t map,
 	}
 
 	if (i == map->dm_nsegs)
-		panic("iommu_dvmamap_sync: too short %lu", offset);
+		panic("iommu_dvmamap_sync: too short %llu", offset);
 
 	for (; len > 0 && i < map->dm_nsegs; i++) {
 		count = MIN(map->dm_segs[i].ds_len - offset, len);
@@ -1500,7 +1500,7 @@ _iommu_dvmamap_sync(bus_dma_tag_t t, bus_dma_tag_t t0, bus_dmamap_t map,
 
 #ifdef DIAGNOSTIC
 	if (i == map->dm_nsegs && len > 0)
-		panic("iommu_dvmamap_sync: leftover %lu", len);
+		panic("iommu_dvmamap_sync: leftover %llu", len);
 #endif
 
 	if (needsflush)
diff --git a/sys/arch/sparc64/dev/psycho.c b/sys/arch/sparc64/dev/psycho.c
index 9584ae4a8ba..651fdeed070 100644
--- a/sys/arch/sparc64/dev/psycho.c
+++ b/sys/arch/sparc64/dev/psycho.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psycho.c,v 1.37 2003/06/24 21:54:39 henric Exp $	*/
+/*	$OpenBSD: psycho.c,v 1.38 2003/12/20 20:08:17 miod Exp $	*/
 /*	$NetBSD: psycho.c,v 1.39 2001/10/07 20:30:41 eeh Exp $	*/
 
 /*
@@ -693,7 +693,7 @@ psycho_ue(void *arg)
 	/*
 	 * It's uncorrectable.  Dump the regs and panic.
 	 */
-	panic("%s: uncorrectable DMA error AFAR %llx (pa=%llx tte=%llx/%llx) "
+	panic("%s: uncorrectable DMA error AFAR %llx (pa=%lx tte=%llx/%llx) "
 	    "AFSR %llx", sc->sc_dev.dv_xname, afar,
 	    iommu_extract(sc->sc_is, (vaddr_t)afar),
 	    iommu_lookup_tte(sc->sc_is, (vaddr_t)afar),
diff --git a/sys/arch/sparc64/sparc64/db_interface.c b/sys/arch/sparc64/sparc64/db_interface.c
index 010bee27928..c2727adbce5 100644
--- a/sys/arch/sparc64/sparc64/db_interface.c
+++ b/sys/arch/sparc64/sparc64/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.17 2003/07/09 18:08:01 jason Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.18 2003/12/20 20:08:17 miod Exp $	*/
 /*	$NetBSD: db_interface.c,v 1.61 2001/07/31 06:55:47 eeh Exp $ */
 
 /*
@@ -517,9 +517,9 @@ db_dump_dtlb(addr, have_addr, count, modif)
 		dump_dtlb(buf);
 		p = buf;
 		for (i=0; i<64;) {
-			db_printf("%2d:%16.16lx %16.16lx ", i++, p[0], p[1]);
+			db_printf("%2d:%16.16llx %16.16llx ", i++, p[0], p[1]);
 			p += 2;
-			db_printf("%2d:%16.16lx %16.16lx\n", i++, p[0], p[1]);
+			db_printf("%2d:%16.16llx %16.16llx\n", i++, p[0], p[1]);
 			p += 2;
 		}
 	}
-- 
cgit v1.2.3