Format string fixes and removal of -Wno-format for sgi. Based upon an

initial diff from jasper@

diff --git a/sys/arch/mips64/mips64/db_machdep.c b/sys/arch/mips64/mips64/db_machdep.c
index dcc48bc..5dad12f 100644 (file)
--- a/sys/arch/mips64/mips64/db_machdep.c
+++ b/sys/arch/mips64/mips64/db_machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: db_machdep.c,v 1.39 2014/05/10 22:25:16 jasper Exp $ */
+/*     $OpenBSD: db_machdep.c,v 1.40 2014/05/19 21:18:42 miod Exp $ */
 
 /*
  * Copyright (c) 1998-2003 Opsycon AB (www.opsycon.se)
@@ -256,7 +256,7 @@ db_cpuinfo_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
        int i;
 
        for (i = 0; i < ncpus; i++) {
-               db_printf("%c%4d: ", (i == cpu_number()) ? '*' : ' ',
+               db_printf("%c%4ld: ", (i == cpu_number()) ? '*' : ' ',
                    get_cpu_info(i)->ci_cpuid);
                switch(get_cpu_info(i)->ci_ddb) {
                case CI_DDB_RUNNING:

diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi
index c3946b2..8e3ab65 100644 (file)
--- a/sys/arch/sgi/conf/Makefile.sgi
+++ b/sys/arch/sgi/conf/Makefile.sgi
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.sgi,v 1.62 2013/10/15 19:23:29 guenther Exp $
+#      $OpenBSD: Makefile.sgi,v 1.63 2014/05/19 21:18:42 miod Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -31,7 +31,7 @@ _archdir?=    $S/arch/${_arch}
 INCLUDES=      -nostdinc -I$S -I. -I$S/arch
 CPPFLAGS=      ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ -MD -MP
 CWARNFLAGS=    -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-               -Wno-main -Wno-uninitialized -Wno-format \
+               -Wno-main -Wno-uninitialized \
                -Wstack-larger-than-2047
 
 CMACHFLAGS=    -mno-abicalls ${ABI} -msoft-float -G 0

diff --git a/sys/arch/sgi/dev/if_iec.c b/sys/arch/sgi/dev/if_iec.c
index 9f84a47..17c6322 100644 (file)
--- a/sys/arch/sgi/dev/if_iec.c
+++ b/sys/arch/sgi/dev/if_iec.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_iec.c,v 1.9 2013/08/17 15:44:08 bluhm Exp $        */
+/*     $OpenBSD: if_iec.c,v 1.10 2014/05/19 21:18:42 miod Exp $        */
 
 /*
  * Copyright (c) 2009 Miodrag Vallat.
@@ -1290,7 +1290,7 @@ dropit:
                if (rxd->rxd_err & (IEC_RXERR_BADPACKET | IEC_RXERR_LONGEVENT |
                     IEC_RXERR_INVPREAMB | IEC_RXERR_CODE | IEC_RXERR_FRAME |
                     IEC_RXERR_CRC)) {
-                       printf("%s: iec_rxintr: stat = 0x%08x err = %08x\n",
+                       printf("%s: iec_rxintr: stat = 0x%08llx err = %08x\n",
                            sc->sc_dev.dv_xname, rxstat, rxd->rxd_err);
                        goto dropit;
                }

diff --git a/sys/arch/sgi/dev/mavb.c b/sys/arch/sgi/dev/mavb.c
index a94079f..0b2b422 100644 (file)
--- a/sys/arch/sgi/dev/mavb.c
+++ b/sys/arch/sgi/dev/mavb.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mavb.c,v 1.16 2013/06/21 09:34:06 ratchov Exp $       */
+/*     $OpenBSD: mavb.c,v 1.17 2014/05/19 21:18:42 miod Exp $  */
 
 /*
  * Copyright (c) 2005 Mark Kettenis
@@ -1056,11 +1056,11 @@ mavb_dma_output(struct mavb_softc *sc)
        src = sc->play.sw_cur;
 
        if (write_ptr % MAVB_CHAN_CHUNK_SIZE) {
-               printf("%s: write_ptr=%d\n", sc->sc_dev.dv_xname, write_ptr);
+               printf("%s: write_ptr=%lld\n", sc->sc_dev.dv_xname, write_ptr);
                return;
        }
        if ((src - sc->play.sw_start) % MAVB_CHAN_CHUNK_SIZE) {
-               printf("%s: src=%d\n", sc->sc_dev.dv_xname,
+               printf("%s: src=%ld\n", sc->sc_dev.dv_xname,
                    src - sc->play.sw_start);
                return;
        }
@@ -1100,11 +1100,11 @@ mavb_dma_input(struct mavb_softc *sc)
        dst = sc->rec.sw_cur;
 
        if (read_ptr % MAVB_CHAN_CHUNK_SIZE) {
-               printf("%s: read_ptr=%d\n", sc->sc_dev.dv_xname, read_ptr);
+               printf("%s: read_ptr=%lld\n", sc->sc_dev.dv_xname, read_ptr);
                return;
        }
        if ((dst - sc->rec.sw_start) % MAVB_CHAN_CHUNK_SIZE) {
-               printf("%s: dst=%d\n", sc->sc_dev.dv_xname,
+               printf("%s: dst=%ld\n", sc->sc_dev.dv_xname,
                    dst - sc->rec.sw_start);
                return;
        }

diff --git a/sys/arch/sgi/gio/gio.c b/sys/arch/sgi/gio/gio.c
index 2959ab4..2fa7d13 100644 (file)
--- a/sys/arch/sgi/gio/gio.c
+++ b/sys/arch/sgi/gio/gio.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: gio.c,v 1.17 2014/03/27 21:24:22 miod Exp $   */
+/*     $OpenBSD: gio.c,v 1.18 2014/05/19 21:18:42 miod Exp $   */
 /*     $NetBSD: gio.c,v 1.32 2011/07/01 18:53:46 dyoung Exp $  */
 
 /*
@@ -489,7 +489,7 @@ gio_print(void *aux, const char *pnp)
 
        if (ga->ga_slot != -1)
                printf(" slot %d", ga->ga_slot);
-       printf(" addr 0x%lx", ga->ga_addr);
+       printf(" addr 0x%llx", ga->ga_addr);
 
        return UNCONF;
 }
@@ -523,7 +523,7 @@ gio_print_fb(void *aux, const char *pnp)
                printf("%s at %s", fbname, pnp);
        }
 
-       printf(" addr 0x%lx", ga->ga_addr);
+       printf(" addr 0x%llx", ga->ga_addr);
 
        return UNCONF;
 }

diff --git a/sys/arch/sgi/gio/pci_gio.c b/sys/arch/sgi/gio/pci_gio.c
index bbd2ae6..4005b9c 100644 (file)
--- a/sys/arch/sgi/gio/pci_gio.c
+++ b/sys/arch/sgi/gio/pci_gio.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pci_gio.c,v 1.1 2012/05/18 20:31:40 miod Exp $        */
+/*     $OpenBSD: pci_gio.c,v 1.2 2014/05/19 21:18:42 miod Exp $        */
 /*     $NetBSD: pci_gio.c,v 1.9 2011/07/01 18:53:46 dyoung Exp $       */
 
 /*
@@ -449,7 +449,7 @@ giopci_intr_establish(void *v, pci_intr_handle_t ih, int level,
 void
 giopci_intr_disestablish(void *v, void *ih)
 {
-       panic("%s");
+       panic("%s", __func__);
 }
 
 int
@@ -462,7 +462,7 @@ int
 giopci_ppb_setup(void *cookie, pcitag_t tag, bus_addr_t *iostart,
     bus_addr_t *ioend, bus_addr_t *memstart, bus_addr_t *memend)
 {
-       panic("%s");
+       panic("%s", __func__);
 }
 
 #if NCARDBUS > 0

diff --git a/sys/arch/sgi/hpc/zs.c b/sys/arch/sgi/hpc/zs.c
index 0b1c1be..dc2a632 100644 (file)
--- a/sys/arch/sgi/hpc/zs.c
+++ b/sys/arch/sgi/hpc/zs.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: zs.c,v 1.11 2013/10/21 12:14:51 miod Exp $    */
+/*     $OpenBSD: zs.c,v 1.12 2014/05/19 21:18:42 miod Exp $    */
 /*     $NetBSD: zs.c,v 1.37 2011/02/20 07:59:50 matt Exp $     */
 
 /*-
@@ -255,7 +255,7 @@ zs_hpc_attach(struct device *parent, struct device *self, void *aux)
                                        zs_chan_offset[channel],
                                        sizeof(struct zschan),
                                        &ch->cs_regs) != 0) {
-                       printf(": cannot map regs\n", self->dv_xname);
+                       printf(": cannot map regs\n");
                        return;
                }
                ch->cs_bustag = zsc->zsc_bustag;

diff --git a/sys/arch/sgi/localbus/imc.c b/sys/arch/sgi/localbus/imc.c
index 93f5f00..58e78bb 100644 (file)
--- a/sys/arch/sgi/localbus/imc.c
+++ b/sys/arch/sgi/localbus/imc.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: imc.c,v 1.15 2014/03/27 21:24:22 miod Exp $   */
+/*     $OpenBSD: imc.c,v 1.16 2014/05/19 21:18:42 miod Exp $   */
 /*     $NetBSD: imc.c,v 1.32 2011/07/01 18:53:46 dyoung Exp $  */
 
 /*
@@ -749,7 +749,8 @@ imc_bus_error(uint32_t hwpend, struct trap_frame *tf)
                                copyin((void *)pc, &insn, sizeof insn);
 
                        printf(" cpu_stat %08x addr %08x pc %p insn %08x",
-                           cpustat, imc_read(IMC_CPU_ERRADDR), pc, insn);
+                           cpustat, imc_read(IMC_CPU_ERRADDR), (void *)pc,
+                           insn);
                }
                if (giostat != 0)
                        printf(" gio_stat %08x addr %08x",

diff --git a/sys/arch/sgi/localbus/int.c b/sys/arch/sgi/localbus/int.c
index cb18ef3..87dc791 100644 (file)
--- a/sys/arch/sgi/localbus/int.c
+++ b/sys/arch/sgi/localbus/int.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: int.c,v 1.9 2012/10/03 11:18:23 miod Exp $    */
+/*     $OpenBSD: int.c,v 1.10 2014/05/19 21:18:42 miod Exp $   */
 /*     $NetBSD: int.c,v 1.24 2011/07/01 18:53:46 dyoung Exp $  */
 
 /*
@@ -336,7 +336,7 @@ int2_attach(struct device *parent, struct device *self, void *aux)
        if (int2_base == 0)
                int2_base = int2_get_base();
 
-       printf(" addr 0x%x\n", XKPHYS_TO_PHYS(int2_base));
+       printf(" addr 0x%lx\n", XKPHYS_TO_PHYS(int2_base));
 
        /* Clean out interrupt masks */
        int2_write(INT2_LOCAL0_MASK, 0);

diff --git a/sys/arch/sgi/localbus/macebus.c b/sys/arch/sgi/localbus/macebus.c
index 1ef13d5..2bef5f2 100644 (file)
--- a/sys/arch/sgi/localbus/macebus.c
+++ b/sys/arch/sgi/localbus/macebus.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: macebus.c,v 1.61 2012/10/03 11:18:23 miod Exp $ */
+/*     $OpenBSD: macebus.c,v 1.62 2014/05/19 21:18:42 miod Exp $ */
 
 /*
  * Copyright (c) 2000-2004 Opsycon AB  (www.opsycon.se)
@@ -223,7 +223,7 @@ macebusprint(void *aux, const char *macebus)
                printf("%s at %s", maa->maa_name, macebus);
 
        if (maa->maa_baseaddr != 0)
-               printf(" base 0x%08x", maa->maa_baseaddr);
+               printf(" base 0x%08lx", maa->maa_baseaddr);
        if (maa->maa_intr >= 0)
                printf(" irq %d", maa->maa_intr);
 
@@ -594,7 +594,8 @@ do { \
            (1 << (bit))) != 0) { \
                if ((mace_isr & mace_imr) != 0) \
                        printf("spurious crime interrupt %d" \
-                           " mace isr %p imr %p\n", bit, mace_isr, mace_imr); \
+                           " mace isr %p imr %p\n", \
+                           bit, (void *)mace_isr, (void *)mace_imr); \
        } else \
                printf("spurious crime interrupt %d\n", bit); \
 } while (0)

diff --git a/sys/arch/sgi/localbus/tcc.c b/sys/arch/sgi/localbus/tcc.c
index 63d84db..839dcef 100644 (file)
--- a/sys/arch/sgi/localbus/tcc.c
+++ b/sys/arch/sgi/localbus/tcc.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: tcc.c,v 1.4 2014/03/29 18:09:30 guenther Exp $        */
+/*     $OpenBSD: tcc.c,v 1.5 2014/05/19 21:18:42 miod Exp $    */
 
 /*
  * Copyright (c) 2012 Miodrag Vallat.
@@ -107,7 +107,7 @@ tcc_bus_error(uint32_t hwpend, struct trap_frame *tf)
        error = tcc_read(TCC_ERROR);
        addr = tcc_read(TCC_BERR_ADDR);
 
-       printf("tcc bus error: intr %lx error %lx (%d) addr %08lx\n",
+       printf("tcc bus error: intr %llx error %llx (%llu) addr %08llx\n",
            intr, error, (error & TCC_ERROR_TYPE_MASK) >> TCC_ERROR_TYPE_SHIFT,
            addr);
 
@@ -217,7 +217,7 @@ tcc_virtual(struct cpu_info *ci, vaddr_t va, vsize_t sz, uint64_t op)
                /* get the proper physical address */
                if (pmap_extract(pmap_kernel(), va, &pa) == 0) {
 #ifdef DIAGNOSTIC
-                       panic("%s: invalid va %p", __func__, va);
+                       panic("%s: invalid va %p", __func__, (void *)va);
 #else
                        /* should not happen */
 #endif

diff --git a/sys/arch/sgi/pci/ioc.c b/sys/arch/sgi/pci/ioc.c
index 850157b..8224f38 100644 (file)
--- a/sys/arch/sgi/pci/ioc.c
+++ b/sys/arch/sgi/pci/ioc.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ioc.c,v 1.38 2012/05/30 16:43:31 miod Exp $   */
+/*     $OpenBSD: ioc.c,v 1.39 2014/05/19 21:18:42 miod Exp $   */
 
 /*
  * Copyright (c) 2008 Joel Sing.
@@ -141,7 +141,7 @@ ioc_print(void *aux, const char *iocname)
 
        /* no base for onewire, and don't display it for rtc */
        if ((int)iaa->iaa_base > 0 && (int)iaa->iaa_base < IOC3_BYTEBUS_0)
-               printf(" base 0x%x", iaa->iaa_base);
+               printf(" base 0x%lx", iaa->iaa_base);
 
        return (UNCONF);
 }

diff --git a/sys/arch/sgi/pci/iof.c b/sys/arch/sgi/pci/iof.c
index 08ed774..cc99d18 100644 (file)
--- a/sys/arch/sgi/pci/iof.c
+++ b/sys/arch/sgi/pci/iof.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: iof.c,v 1.8 2011/10/10 19:49:16 miod Exp $    */
+/*     $OpenBSD: iof.c,v 1.9 2014/05/19 21:18:42 miod Exp $    */
 
 /*
  * Copyright (c) 2009 Miodrag Vallat.
@@ -98,7 +98,7 @@ iof_print(void *aux, const char *iofname)
        if (iofname != NULL)
                printf("%s at %s", iaa->iaa_name, iofname);
 
-       printf(" base 0x%x", iaa->iaa_base);
+       printf(" base 0x%lx", iaa->iaa_base);
 
        return UNCONF;
 }

diff --git a/sys/arch/sgi/pci/macepcibridge.c b/sys/arch/sgi/pci/macepcibridge.c
index 91b6222..27c4bb2 100644 (file)
--- a/sys/arch/sgi/pci/macepcibridge.c
+++ b/sys/arch/sgi/pci/macepcibridge.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: macepcibridge.c,v 1.46 2014/04/03 08:07:16 mpi Exp $ */
+/*     $OpenBSD: macepcibridge.c,v 1.47 2014/05/19 21:18:42 miod Exp $ */
 
 /*
  * Copyright (c) 2009 Miodrag Vallat.
@@ -113,8 +113,6 @@ void        mace_pcibr_configure(struct mace_pcibr_softc *);
 void   mace_pcibr_device_fixup(struct mace_pcibr_softc *, int, int);
 int    mace_pcibr_errintr(void *);
 
-extern void pciaddr_remap(pci_chipset_tag_t);
-
 struct cfattach macepcibr_ca = {
        sizeof(struct mace_pcibr_softc), mace_pcibrmatch, mace_pcibrattach,
 };
@@ -219,7 +217,7 @@ const struct _perr_map {
   { 0, 0, NULL }
 };
 
-static int      mace_pcibrprint(void *, const char *pnp);
+static int mace_pcibrprint(void *, const char *pnp);
 
 int
 mace_pcibrmatch(struct device *parent, void *match, void *aux)
@@ -505,7 +503,7 @@ mace_pcibr_intr_string(void *lcv, pci_intr_handle_t ih)
 {
        static char str[16];
 
-       snprintf(str, sizeof(str), "irq %d", ih);
+       snprintf(str, sizeof(str), "irq %ld", ih);
        return(str);
 }
 

diff --git a/sys/arch/sgi/sgi/bus_dma.c b/sys/arch/sgi/sgi/bus_dma.c
index 63e27d0..f932d5d 100644 (file)
--- a/sys/arch/sgi/sgi/bus_dma.c
+++ b/sys/arch/sgi/sgi/bus_dma.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: bus_dma.c,v 1.33 2014/04/03 08:07:16 mpi Exp $ */
+/*     $OpenBSD: bus_dma.c,v 1.34 2014/05/19 21:18:42 miod Exp $ */
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -601,14 +601,14 @@ _dmamap_load_buffer(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
                 * Get the physical address for this segment.
                 */
                if (pmap_extract(pmap, vaddr, &curaddr) == FALSE)
-                       panic("_dmapmap_load_buffer: pmap_extract(%x, %x) failed!",
-                           pmap, vaddr);
+                       panic("_dmapmap_load_buffer: pmap_extract(%p, %p) failed!",
+                           pmap, (void *)vaddr);
 
 #ifdef DIAGNOSTIC
                if (curaddr > dma_constraint.ucr_high ||
                    curaddr < dma_constraint.ucr_low)
-                       panic("Non DMA-reachable buffer at curaddr %p (raw)",
-                           curaddr);
+                       panic("Non DMA-reachable buffer at addr %p (raw)",
+                           (void *)curaddr);
 #endif
 
                /*

diff --git a/sys/arch/sgi/sgi/ip22_machdep.c b/sys/arch/sgi/sgi/ip22_machdep.c
index 42c066d..39fd2f8 100644 (file)
--- a/sys/arch/sgi/sgi/ip22_machdep.c
+++ b/sys/arch/sgi/sgi/ip22_machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ip22_machdep.c,v 1.17 2014/04/03 08:07:16 mpi Exp $   */
+/*     $OpenBSD: ip22_machdep.c,v 1.18 2014/05/19 21:18:42 miod Exp $  */
 
 /*
  * Copyright (c) 2012 Miodrag Vallat.
@@ -827,7 +827,8 @@ ip22_IOSyncDCache(struct cpu_info *ci, vaddr_t _va, size_t _sz, int how)
                        /* get the proper physical address */
                        if (pmap_extract(pmap_kernel(), va, &pa) == 0) {
 #ifdef DIAGNOSTIC
-                               panic("%s: invalid va %p", __func__, va);
+                               panic("%s: invalid va %p",
+                                   __func__, (void *)va);
 #else
                                /* should not happen */
 #endif

diff --git a/sys/arch/sgi/sgi/ip27_machdep.c b/sys/arch/sgi/sgi/ip27_machdep.c
index 49aa716..c86e2b4 100644 (file)
--- a/sys/arch/sgi/sgi/ip27_machdep.c
+++ b/sys/arch/sgi/sgi/ip27_machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ip27_machdep.c,v 1.58 2014/04/03 08:07:16 mpi Exp $   */
+/*     $OpenBSD: ip27_machdep.c,v 1.59 2014/05/19 21:18:42 miod Exp $  */
 
 /*
  * Copyright (c) 2008, 2009 Miodrag Vallat.
@@ -927,8 +927,9 @@ ip27_nmi(void *arg)
        regs++;                         /* NMI COP_0_STATUS_REG */
 
        setsr(getsr() & ~SR_BOOT_EXC_VEC);
-       printf("NMI, PC = %p RA = %p SR = %08x EPC = %p\n",
-           nmi_frame.pc, nmi_frame.ra, nmi_frame.sr, epc);
+       printf("NMI, PC = %p RA = %p SR = %08lx EPC = %p\n",
+           (void *)nmi_frame.pc, (void *)nmi_frame.ra, nmi_frame.sr,
+           (void *)epc);
 #ifdef DDB
        (void)kdb_trap(-1, &nmi_frame);
 #endif

diff --git a/sys/arch/sgi/sgi/machdep.c b/sys/arch/sgi/sgi/machdep.c
index ffc926c..96ee706 100644 (file)
--- a/sys/arch/sgi/sgi/machdep.c
+++ b/sys/arch/sgi/sgi/machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: machdep.c,v 1.137 2014/04/03 08:07:16 mpi Exp $ */
+/*     $OpenBSD: machdep.c,v 1.138 2014/05/19 21:18:42 miod Exp $ */
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -982,7 +982,7 @@ dumpsys()
                dumpconf();
        if (dumplo < 0)
                return;
-       printf("\ndumping to dev %x, offset %d\n", dumpdev, dumplo);
+       printf("\ndumping to dev %x, offset %ld\n", dumpdev, dumplo);
        printf("dump not yet implemented\n");
 #if 0 /* XXX HAVE TO FIX XXX */
        switch (error = (*bdevsw[major(dumpdev)].d_dump)(dumpdev, dumplo,)) {

diff --git a/sys/arch/sgi/xbow/xbridge.c b/sys/arch/sgi/xbow/xbridge.c
index 82aee65..a662b60 100644 (file)
--- a/sys/arch/sgi/xbow/xbridge.c
+++ b/sys/arch/sgi/xbow/xbridge.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: xbridge.c,v 1.88 2014/04/03 08:07:16 mpi Exp $        */
+/*     $OpenBSD: xbridge.c,v 1.89 2014/05/19 21:18:42 miod Exp $       */
 
 /*
  * Copyright (c) 2008, 2009, 2011  Miodrag Vallat.
@@ -1058,7 +1058,7 @@ xbridge_intr_string(void *cookie, pci_intr_handle_t ih)
 
        if (xb->xb_intrstr[intrbit][0] == '\0')
                snprintf(xb->xb_intrstr[intrbit],
-                   sizeof xb->xb_intrstr[intrbit], "irq %d", ih);
+                   sizeof xb->xb_intrstr[intrbit], "irq %ld", ih);
        return xb->xb_intrstr[intrbit];
 }
 
@@ -1957,7 +1957,7 @@ xbridge_err_handle(struct xbpci_softc *xb, uint64_t isr)
                    xbridge_read_reg(xb, BRIDGE_WIDGET_RESP_UPPER) << 32;
 
        /* XXX give more detailed information */
-       printf("%s: error interrupt, isr %p wid %p pci %p resp %p\n",
+       printf("%s: error interrupt, isr %llx wid %llx pci %llx resp %llx\n",
            DEVNAME(xb), isr, wid_err, pci_err, resp_err);
 
        xbridge_err_clear(xb, isr);