diff options
| author |   miod <miod@openbsd.org> | 2014-06-09 14:33:20 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2014-06-09 14:33:20 +0000 |
| commit | 7d1bd7d444b7f15491d2fb5c4aa48fe162758039 (patch) | |
| tree | 4ad11f2eeb7d9b22b25c4cd426654696b3fb6397 | |
| parent | More KNF. (diff) | |
| download | wireguard-openbsd-7d1bd7d444b7f15491d2fb5c4aa48fe162758039.tar.xz wireguard-openbsd-7d1bd7d444b7f15491d2fb5c4aa48fe162758039.zip | |
More format string fixes (in 88110 code)
| -rw-r--r-- | sys/arch/m88k/m88k/pmap.c | 4 | ||||
| -rw-r--r-- | sys/arch/m88k/m88k/trap.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/m88k/m88k/pmap.c b/sys/arch/m88k/m88k/pmap.c index 2109637b695..2e0128b82a5 100644 --- a/sys/arch/m88k/m88k/pmap.c +++ b/sys/arch/m88k/m88k/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.77 2014/05/17 12:22:09 miod Exp $ */ +/* $OpenBSD: pmap.c,v 1.78 2014/06/09 14:33:20 miod Exp $ */ /* * Copyright (c) 2001-2004, 2010, Miodrag Vallat. @@ -1887,7 +1887,7 @@ pmap_set_modify(pmap_t pmap, vaddr_t va) pg = PHYS_TO_VM_PAGE(pa); #ifdef DIAGNOSTIC if (pg == NULL) - panic("Write fault to unmanaged page %p", pa); + panic("Write fault to unmanaged page %p", (void *)pa); #endif pvl = pg_to_pvh(pg); diff --git a/sys/arch/m88k/m88k/trap.c b/sys/arch/m88k/m88k/trap.c index 2125b291858..302efe39490 100644 --- a/sys/arch/m88k/m88k/trap.c +++ b/sys/arch/m88k/m88k/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.96 2014/05/31 11:27:50 miod Exp $ */ +/* $OpenBSD: trap.c,v 1.97 2014/06/09 14:33:20 miod Exp $ */ /* * Copyright (c) 2004, Miodrag Vallat. * Copyright (c) 1998 Steve Murphree, Jr. @@ -140,7 +140,7 @@ printtrap(int type, struct trapframe *frame) #endif #ifdef M88110 if (CPU_IS88110) { - printf("\nTrap type %d, v = %x, frame %p\n", + printf("\nTrap type %d, v = %lx, frame %p\n", type, frame->tf_exip, frame); } #endif @@ -682,14 +682,14 @@ m88110_trap(u_int type, struct trapframe *frame) if (!USERMODE(frame->tf_epsr)) { instr = *(u_int *)fault_addr; if (instr == 0xf400cc01) - panic("mc88110 errata #16, exip %p enip %p", + panic("mc88110 errata #16, exip 0x%lx enip 0x%lx", (frame->tf_exip + 4) | 1, frame->tf_enip); } else { /* copyin here should not fail */ if (copyin((const void *)frame->tf_exip, &instr, sizeof instr) == 0 && instr == 0xf400cc01) { - uprintf("mc88110 errata #16, exip %p enip %p", + uprintf("mc88110 errata #16, exip 0x%lx enip 0x%lx", (frame->tf_exip + 4) | 1, frame->tf_enip); sig = SIGILL; } @@ -805,7 +805,7 @@ lose: goto lose; case T_MISALGNFLT: printf("kernel misaligned access exception @%p\n", - frame->tf_exip); + (void *)frame->tf_exip); goto lose; case T_INSTFLT: /* kernel mode instruction access fault. |