Format string fixes for alpha kernels, and remove -Wno-format

4 files changed, 10 insertions, 10 deletions

diff --git a/sys/arch/alpha/pci/pci_kn20aa.c b/sys/arch/alpha/pci/pci_kn20aa.c
index 4864d800901..4d3149b9c6d 100644
--- a/sys/arch/alpha/pci/pci_kn20aa.c
+++ b/sys/arch/alpha/pci/pci_kn20aa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_kn20aa.c,v 1.26 2009/09/30 20:18:06 miod Exp $	*/
+/*	$OpenBSD: pci_kn20aa.c,v 1.27 2014/05/08 20:46:49 miod Exp $	*/
 /*	$NetBSD: pci_kn20aa.c,v 1.21 1996/11/17 02:05:27 cgd Exp $	*/
 
 /*
@@ -175,7 +175,7 @@ dec_kn20aa_intr_string(ccv, ih)
         static char irqstr[15];          /* 11 + 2 + NULL + sanity */
 
         if (ih > KN20AA_MAX_IRQ)
-		panic("dec_kn20aa_intr_string: bogus kn20aa IRQ 0x%x", ih);
+		panic("dec_kn20aa_intr_string: bogus kn20aa IRQ 0x%lx", ih);
 
         snprintf(irqstr, sizeof irqstr, "kn20aa irq %ld", ih);
         return (irqstr);
@@ -200,7 +200,7 @@ dec_kn20aa_intr_establish(ccv, ih, level, func, arg, name)
 	void *cookie;
 
         if (ih > KN20AA_MAX_IRQ)
-                panic("dec_kn20aa_intr_establish: bogus kn20aa IRQ 0x%x",
+                panic("dec_kn20aa_intr_establish: bogus kn20aa IRQ 0x%lx",
 		    ih);
 
 	cookie = alpha_shared_intr_establish(kn20aa_pci_intr, ih, IST_LEVEL,
diff --git a/sys/arch/alpha/pci/pci_kn300.c b/sys/arch/alpha/pci/pci_kn300.c
index 2af6cceeb4e..040097f4127 100644
--- a/sys/arch/alpha/pci/pci_kn300.c
+++ b/sys/arch/alpha/pci/pci_kn300.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_kn300.c,v 1.5 2012/12/05 23:20:10 deraadt Exp $ */
+/* $OpenBSD: pci_kn300.c,v 1.6 2014/05/08 20:46:49 miod Exp $ */
 /* $NetBSD: pci_kn300.c,v 1.28 2005/12/11 12:16:17 christos Exp $ */
 
 /*
@@ -182,7 +182,7 @@ dec_kn300_intr_string(ccv, ih)
 	if (irq >= NIRQ)
 		panic("dec_kn300_intr_string: bogus kn300 IRQ 0x%x", irq);
 
-	snprintf(irqstr, sizeof irqstr, "kn300 irq %ld", irq);
+	snprintf(irqstr, sizeof irqstr, "kn300 irq %d", irq);
 
 	return (irqstr);
 }
diff --git a/sys/arch/alpha/pci/tsp_bus_mem.c b/sys/arch/alpha/pci/tsp_bus_mem.c
index 97017b5b0fb..7caefea4962 100644
--- a/sys/arch/alpha/pci/tsp_bus_mem.c
+++ b/sys/arch/alpha/pci/tsp_bus_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tsp_bus_mem.c,v 1.4 2003/09/02 17:25:21 miod Exp $ */
+/* $OpenBSD: tsp_bus_mem.c,v 1.5 2014/05/08 20:46:49 miod Exp $ */
 /* $NetBSD: tsp_bus_mem.c,v 1.4 2000/06/26 19:46:25 thorpej Exp $ */
 
 /*-
@@ -90,7 +90,7 @@ tsp_bus_mem_init2(void *v)
 		    EX_NOWAIT | (CHIP_EX_MALLOC_SAFE(v) ? EX_MALLOCOK : 0));
 		if (error) {
 			printf("WARNING: unable to reserve DMA window "
-			    "0x%lx - 0x%lx\n",
+			    "0x%llx - 0x%llx\n",
 			    WSBA_ADDR(pccsr->tsp_wsba[i].tsg_r),
 			    WSBA_ADDR(pccsr->tsp_wsba[i].tsg_r) +
 			    (WSM_LEN(pccsr->tsp_wsm[i].tsg_r) - 1));
diff --git a/sys/arch/alpha/pci/tsp_dma.c b/sys/arch/alpha/pci/tsp_dma.c
index 403a2dfcfb7..32f5d3fb695 100644
--- a/sys/arch/alpha/pci/tsp_dma.c
+++ b/sys/arch/alpha/pci/tsp_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tsp_dma.c,v 1.9 2014/01/06 20:11:40 miod Exp $ */
+/* $OpenBSD: tsp_dma.c,v 1.10 2014/05/08 20:46:49 miod Exp $ */
 /* $NetBSD: tsp_dma.c,v 1.1 1999/06/29 06:46:47 ross Exp $ */
 
 /*-
@@ -207,8 +207,8 @@ tsp_dma_init(struct device *tsp, struct tsp_config *pcp)
 	 */
 	if ((sgwbase <= dwbase && dwbase < sgwbase + sgwlen) ||
 	    (dwbase <= sgwbase && sgwbase < dwbase + dwlen))
-		panic("tsp_dma_init: overlap sg %p len %p d %p len %p",
-		    sgwbase, sgwlen, dwbase, dwlen);
+		panic("%s: overlap sg 0x%lx len 0x%lx d 0x%lx len 0x%lx",
+		    __func__, sgwbase, sgwlen, dwbase, dwlen);
 
 	tbase = pcp->pc_sgmap.aps_ptpa;
 	if (tbase & ~0x7fffffc00UL)