diff options
| author |   miod <miod@openbsd.org> | 2014-05-08 21:43:04 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2014-05-08 21:43:04 +0000 |
| commit | a80d39106f4444764ee963f55af75dac3b57af84 (patch) | |
| tree | 368a9839c69b25beb2e7f2e2b9bd4e5944cb2db2 | |
| parent | Format string fixes and removal of -Wno-format for hppa kernels. (diff) | |
| download | wireguard-openbsd-a80d39106f4444764ee963f55af75dac3b57af84.tar.xz wireguard-openbsd-a80d39106f4444764ee963f55af75dac3b57af84.zip | |
Format string fixes and removal of -Wno-format for landisk kernels
| -rw-r--r-- | sys/arch/landisk/conf/Makefile.landisk | 4 | ||||
| -rw-r--r-- | sys/arch/sh/sh/sh_machdep.c | 4 | ||||
| -rw-r--r-- | sys/arch/sh/sh/trap.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk index 5cc93316c04..bcd37fe3aea 100644 --- a/sys/arch/landisk/conf/Makefile.landisk +++ b/sys/arch/landisk/conf/Makefile.landisk @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.landisk,v 1.49 2013/10/15 19:23:27 guenther Exp $ +# $OpenBSD: Makefile.landisk,v 1.50 2014/05/08 21:43:04 miod Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -24,7 +24,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= -m4-nofpu diff --git a/sys/arch/sh/sh/sh_machdep.c b/sys/arch/sh/sh/sh_machdep.c index ff2a40384dc..ccf4468d05c 100644 --- a/sys/arch/sh/sh/sh_machdep.c +++ b/sys/arch/sh/sh/sh_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sh_machdep.c,v 1.36 2014/03/26 05:23:42 guenther Exp $ */ +/* $OpenBSD: sh_machdep.c,v 1.37 2014/05/08 21:43:04 miod Exp $ */ /* $NetBSD: sh3_machdep.c,v 1.59 2006/03/04 01:13:36 uwe Exp $ */ /* @@ -265,7 +265,7 @@ sh_startup() sh_vector_interrupt_end - sh_vector_interrupt); #endif /* DEBUG */ - printf("real mem = %u (%uMB)\n", ptoa(physmem), + printf("real mem = %lu (%luMB)\n", ptoa(physmem), ptoa(physmem) / 1024 / 1024); /* diff --git a/sys/arch/sh/sh/trap.c b/sys/arch/sh/sh/trap.c index b6f80f953d5..56c9828686c 100644 --- a/sys/arch/sh/sh/trap.c +++ b/sys/arch/sh/sh/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.25 2014/04/18 11:51:17 guenther Exp $ */ +/* $OpenBSD: trap.c,v 1.26 2014/05/08 21:43:04 miod Exp $ */ /* $NetBSD: exception.c,v 1.32 2006/09/04 23:57:52 uwe Exp $ */ /* $NetBSD: syscall.c,v 1.6 2006/03/07 07:21:50 thorpej Exp $ */ @@ -296,7 +296,7 @@ do_panic: else printf("EXPEVT 0x%03x", expevt); printf(" in %s mode\n", expevt & EXP_USER ? "user" : "kernel"); - printf("va %p spc %p ssr %p pr %p \n", + printf("va 0x%x spc 0x%x ssr 0x%x pr 0x%x \n", va, tf->tf_spc, tf->tf_ssr, tf->tf_pr); panic("general_exception"); |