diff options
author | Miod Vallat <miod@cvs.openbsd.org> | 2014-05-09 18:16:16 +0000 |
---|---|---|
committer | Miod Vallat <miod@cvs.openbsd.org> | 2014-05-09 18:16:16 +0000 |
commit | 7699954e2c9dcc5827f97d694bbfb89b924fc102 (patch) | |
tree | 09846fb4a5e504a46101b7cc571ef314bb649d7d /sys/arch/socppc | |
parent | c2a86cd44cccc796fc49d72dd87c93ed3207a1fc (diff) |
Format string fixes and removal of -Wno-format for *ppc kernels.
Diffstat (limited to 'sys/arch/socppc')
-rw-r--r-- | sys/arch/socppc/conf/Makefile.socppc | 4 | ||||
-rw-r--r-- | sys/arch/socppc/dev/obio.c | 4 | ||||
-rw-r--r-- | sys/arch/socppc/socppc/machdep.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/socppc/conf/Makefile.socppc b/sys/arch/socppc/conf/Makefile.socppc index c8ab05671f2..11ec405c561 100644 --- a/sys/arch/socppc/conf/Makefile.socppc +++ b/sys/arch/socppc/conf/Makefile.socppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.socppc,v 1.38 2013/10/15 19:23:30 guenther Exp $ +# $OpenBSD: Makefile.socppc,v 1.39 2014/05/09 18:16:15 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= -msoft-float -Wa,-many diff --git a/sys/arch/socppc/dev/obio.c b/sys/arch/socppc/dev/obio.c index 7aa64c24b7c..77b517208d0 100644 --- a/sys/arch/socppc/dev/obio.c +++ b/sys/arch/socppc/dev/obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: obio.c,v 1.5 2009/09/06 20:09:34 kettenis Exp $ */ +/* $OpenBSD: obio.c,v 1.6 2014/05/09 18:16:15 miod Exp $ */ /* * Copyright (c) 2008 Mark Kettenis @@ -93,7 +93,7 @@ obio_print(void *aux, const char *name) if (name) printf("\"%s\" at %s", oa->oa_name, name); if (oa->oa_offset) - printf(" offset 0x%05x", oa->oa_offset); + printf(" offset 0x%05lx", oa->oa_offset); if (oa->oa_ivec != -1) printf(" ivec %d", oa->oa_ivec); diff --git a/sys/arch/socppc/socppc/machdep.c b/sys/arch/socppc/socppc/machdep.c index 87f0deda4fc..a1e013162d7 100644 --- a/sys/arch/socppc/socppc/machdep.c +++ b/sys/arch/socppc/socppc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.45 2014/04/01 20:42:39 mpi Exp $ */ +/* $OpenBSD: machdep.c,v 1.46 2014/05/09 18:16:15 miod Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -489,7 +489,7 @@ bus_space_map(bus_space_tag_t t, bus_addr_t bpa, bus_size_t size, if (extent_free(devio_ex, bpa, size, EX_NOWAIT | (ppc_malloc_ok ? EX_MALLOCOK : 0))) { - printf("bus_space_map: pa 0x%lx, size 0x%x\n", + printf("bus_space_map: pa 0x%lx, size 0x%lx\n", bpa, size); printf("bus_space_map: can't free region\n"); } @@ -523,7 +523,7 @@ bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size) if (extent_free(devio_ex, bpa | (bsh & PAGE_MASK), size, EX_NOWAIT | (ppc_malloc_ok ? EX_MALLOCOK : 0))) { - printf("bus_space_map: pa 0x%lx, size 0x%x\n", + printf("bus_space_map: pa 0x%lx, size 0x%lx\n", bpa, size); printf("bus_space_map: can't free region\n"); } @@ -792,7 +792,7 @@ cpu_startup() printf("%s", version); - printf("real mem = %u (%uMB)\n", ptoa(physmem), + printf("real mem = %lu (%luMB)\n", ptoa(physmem), ptoa(physmem)/1024/1024); /* |