diff options
Diffstat (limited to 'sys/arch/sgi/localbus')
| -rw-r--r-- | sys/arch/sgi/localbus/imc.c | 5 | ||||
| -rw-r--r-- | sys/arch/sgi/localbus/int.c | 4 | ||||
| -rw-r--r-- | sys/arch/sgi/localbus/macebus.c | 7 | ||||
| -rw-r--r-- | sys/arch/sgi/localbus/tcc.c | 6 |
4 files changed, 12 insertions, 10 deletions
diff --git a/sys/arch/sgi/localbus/imc.c b/sys/arch/sgi/localbus/imc.c index 93f5f003f69..58e78bbd938 100644 --- 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 cb18ef32538..87dc791a665 100644 --- 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 1ef13d58237..2bef5f29a4b 100644 --- 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 63d84dbb106..839dcef29da 100644 --- 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 |