diff options
| author | jym <jym@NetBSD.org> | 2010-07-26 22:33:23 +0000 |
|---|---|---|
| committer | jym <jym@NetBSD.org> | 2010-07-26 22:33:23 +0000 |
| commit | da702eb93d3308fc8835d779ff21d992f8750fda (patch) | |
| tree | fef65ad0418e5560b55de4ebd426c2989d570d53 /sys | |
| parent | 3dd552295f6cae2e76d08062fae8783488fe9b89 (diff) | |
Add PAE to ALL kernel, so that most paddr_t format string errors get caught
during compilation.
While here, fix the compilation for ALL.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/i386/conf/ALL | 5 | ||||
| -rw-r--r-- | sys/arch/i386/pci/pcibios.c | 10 | ||||
| -rw-r--r-- | sys/arch/i386/pci/piixpcib.c | 6 | ||||
| -rw-r--r-- | sys/arch/i386/pnpbios/pnpbios.c | 6 | ||||
| -rw-r--r-- | sys/arch/x86/pci/pci_addr_fixup.c | 7 | ||||
| -rw-r--r-- | sys/compat/ndis/subr_ndis.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/ciss.c | 13 | ||||
| -rw-r--r-- | sys/dev/isa/isadma.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/cz.c | 8 | ||||
| -rw-r--r-- | sys/dev/pci/if_sk.c | 8 | ||||
| -rw-r--r-- | sys/dev/pci/if_wm.c | 10 | ||||
| -rw-r--r-- | sys/dev/pci/yds.c | 16 |
12 files changed, 51 insertions, 50 deletions
diff --git a/sys/arch/i386/conf/ALL b/sys/arch/i386/conf/ALL index 8c7ff973d6d..db797d3447b 100644 --- a/sys/arch/i386/conf/ALL +++ b/sys/arch/i386/conf/ALL @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.261 2010/07/18 10:19:09 jruoho Exp $ +# $NetBSD: ALL,v 1.262 2010/07/26 22:33:23 jym Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.261 $" +#ident "ALL-$Revision: 1.262 $" maxusers 64 # estimated number of users @@ -27,6 +27,7 @@ makeoptions USE_SSP=yes options VM86 # virtual 8086 emulation options USER_LDT # user-settable LDT; used by WINE options X86EMU # 386 Real Mode emulator +options PAE # PAE mode (36 bits physical addressing) # Enhanced SpeedStep Technology in the Pentium M options ENHANCED_SPEEDSTEP diff --git a/sys/arch/i386/pci/pcibios.c b/sys/arch/i386/pci/pcibios.c index 4a1397bac1b..2a550bb1ebb 100644 --- a/sys/arch/i386/pci/pcibios.c +++ b/sys/arch/i386/pci/pcibios.c @@ -1,4 +1,4 @@ -/* $NetBSD: pcibios.c,v 1.38 2010/04/28 19:17:04 dyoung Exp $ */ +/* $NetBSD: pcibios.c,v 1.39 2010/07/26 22:33:23 jym Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pcibios.c,v 1.38 2010/04/28 19:17:04 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcibios.c,v 1.39 2010/07/26 22:33:23 jym Exp $"); #include "opt_pcibios.h" #include "opt_pcifixup.h" @@ -166,7 +166,7 @@ pcibios_init(void) return; } - aprint_normal("PCI BIOS rev. %d.%d found at 0x%lx\n", + aprint_normal("PCI BIOS rev. %d.%d found at %#" PRIxPADDR "\n", rev_maj, rev_min >> 4, ei.bei_entry); aprint_verbose("pcibios: config mechanism %s%s, special cycles %s%s, " "last bus %d\n", @@ -250,8 +250,8 @@ pcibios_pir_init(void) cksum += *(unsigned char *)(p + i); aprint_normal( - "PCI IRQ Routing Table rev. %d.%d found at 0x%lx, " - "size %d bytes (%d entries)\n", rev_maj, rev_min, pa, + "PCI IRQ Routing Table rev. %d.%d found at %#" PRIxPADDR + ", size %d bytes (%d entries)\n", rev_maj, rev_min, pa, tablesize, (tablesize - 32) / 16); if (cksum != 0) { diff --git a/sys/arch/i386/pci/piixpcib.c b/sys/arch/i386/pci/piixpcib.c index 965589bb0e5..6898dc50e38 100644 --- a/sys/arch/i386/pci/piixpcib.c +++ b/sys/arch/i386/pci/piixpcib.c @@ -1,4 +1,4 @@ -/* $NetBSD: piixpcib.c,v 1.18 2010/02/24 22:37:55 dyoung Exp $ */ +/* $NetBSD: piixpcib.c,v 1.19 2010/07/26 22:33:23 jym Exp $ */ /*- * Copyright (c) 2004, 2006 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: piixpcib.c,v 1.18 2010/02/24 22:37:55 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: piixpcib.c,v 1.19 2010/07/26 22:33:23 jym Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -214,7 +214,7 @@ static int piixpcib_set_ownership(struct piixpcib_softc *sc) { int rv; - paddr_t pmagic; + u_long pmagic; static char magic[] = "Copyright (c) 1999 Intel Corporation"; pmagic = vtophys((vaddr_t)magic); diff --git a/sys/arch/i386/pnpbios/pnpbios.c b/sys/arch/i386/pnpbios/pnpbios.c index ae3ebab74d3..14763b81756 100644 --- a/sys/arch/i386/pnpbios/pnpbios.c +++ b/sys/arch/i386/pnpbios/pnpbios.c @@ -1,4 +1,4 @@ -/* $NetBSD: pnpbios.c,v 1.69 2010/04/28 19:17:04 dyoung Exp $ */ +/* $NetBSD: pnpbios.c,v 1.70 2010/07/26 22:33:23 jym Exp $ */ /* * Copyright (c) 2000 Jason R. Thorpe. All rights reserved. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pnpbios.c,v 1.69 2010/04/28 19:17:04 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pnpbios.c,v 1.70 2010/07/26 22:33:23 jym Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -269,7 +269,7 @@ pnpbios_mapit(paddr_t addr, u_long len, vm_prot_t prot) pmap_kenter_pa(va, pa, prot, 0); pmap_update(pmap_kernel()); - return ((void *)(startva + (addr - startpa))); + return ((void *)(startva + (vaddr_t)(addr - startpa))); } static void diff --git a/sys/arch/x86/pci/pci_addr_fixup.c b/sys/arch/x86/pci/pci_addr_fixup.c index 0316308a82a..dd0af8a77f2 100644 --- a/sys/arch/x86/pci/pci_addr_fixup.c +++ b/sys/arch/x86/pci/pci_addr_fixup.c @@ -1,4 +1,4 @@ -/* $NetBSD: pci_addr_fixup.c,v 1.4 2009/02/17 20:35:35 jmcneill Exp $ */ +/* $NetBSD: pci_addr_fixup.c,v 1.5 2010/07/26 22:33:23 jym Exp $ */ /*- * Copyright (c) 2000 UCHIYAMA Yasushi. All rights reserved. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pci_addr_fixup.c,v 1.4 2009/02/17 20:35:35 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_addr_fixup.c,v 1.5 2010/07/26 22:33:23 jym Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -289,7 +289,8 @@ pciaddr_do_resource_allocate(pci_chipset_tag_t pc, pcitag_t tag, } error = extent_alloc_subregion(ex, start, ex->ex_end, size, size, 0, - EX_FAST|EX_NOWAIT|EX_MALLOCOK, addr); + EX_FAST|EX_NOWAIT|EX_MALLOCOK, + (u_long *)addr); if (error) { aprint_debug("No available resources. fixup failed\n"); return (1); diff --git a/sys/compat/ndis/subr_ndis.c b/sys/compat/ndis/subr_ndis.c index 5459114c321..2bffaf99356 100644 --- a/sys/compat/ndis/subr_ndis.c +++ b/sys/compat/ndis/subr_ndis.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.67.2.7 2005/03/31 21:50:11 wpaul Exp $"); #endif #ifdef __NetBSD__ -__KERNEL_RCSID(0, "$NetBSD: subr_ndis.c,v 1.22 2009/06/29 05:08:16 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_ndis.c,v 1.23 2010/07/26 22:33:23 jym Exp $"); #endif /* @@ -1552,10 +1552,10 @@ NdisMRegisterIoPortRange( switch (sc->ndis_iftype){ case PCIBus: case CBus: /* CardBus */ - *offset = (void*)sc->ndis_res_io->res_base; + *offset = (void*)(u_long)sc->ndis_res_io->res_base; break; case PCMCIABus: - *offset = (void*)sc->ndis_res_pcioh.addr; + *offset = (void*)(u_long)sc->ndis_res_pcioh.addr; break; default: return(NDIS_STATUS_FAILURE); diff --git a/sys/dev/ic/ciss.c b/sys/dev/ic/ciss.c index e4fbafe86db..c8afe614a25 100644 --- a/sys/dev/ic/ciss.c +++ b/sys/dev/ic/ciss.c @@ -1,4 +1,4 @@ -/* $NetBSD: ciss.c,v 1.20 2010/03/14 18:06:28 pgoyette Exp $ */ +/* $NetBSD: ciss.c,v 1.21 2010/07/26 22:33:24 jym Exp $ */ /* $OpenBSD: ciss.c,v 1.14 2006/03/13 16:02:23 mickey Exp $ */ /* @@ -19,7 +19,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.20 2010/03/14 18:06:28 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.21 2010/07/26 22:33:24 jym Exp $"); #include "bio.h" @@ -469,9 +469,8 @@ ciss_cmd(struct ciss_ccb *ccb, int flags, int wait) cmd->sgin = dmap->dm_nsegs; sgd = dmap->dm_segs; - CISS_DPRINTF(CISS_D_DMA, ("data=%p/%u<0x%lx/%lu", - ccb->ccb_data, ccb->ccb_len, sgd->ds_addr, - (u_long)sgd->ds_len)); + CISS_DPRINTF(CISS_D_DMA, ("data=%p/%u<%#" PRIxPADDR "/%zu", + ccb->ccb_data, ccb->ccb_len, sgd->ds_addr,sgd->ds_len)); for (i = 0; i < dmap->dm_nsegs; sgd++, i++) { cmd->sgl[i].addr_lo = htole32(sgd->ds_addr); @@ -481,8 +480,8 @@ ciss_cmd(struct ciss_ccb *ccb, int flags, int wait) cmd->sgl[i].flags = htole32(0); if (i) { CISS_DPRINTF(CISS_D_DMA, - (",0x%lx/%lu", sgd->ds_addr, - (u_long)sgd->ds_len)); + (",%#" PRIxPADDR "/%zu", sgd->ds_addr, + sgd->ds_len)); } } diff --git a/sys/dev/isa/isadma.c b/sys/dev/isa/isadma.c index 05a800d9552..8b07fd7be86 100644 --- a/sys/dev/isa/isadma.c +++ b/sys/dev/isa/isadma.c @@ -1,4 +1,4 @@ -/* $NetBSD: isadma.c,v 1.64 2010/04/19 18:24:26 dyoung Exp $ */ +/* $NetBSD: isadma.c,v 1.65 2010/07/26 22:33:24 jym Exp $ */ /*- * Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1.64 2010/04/19 18:24:26 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1.65 2010/07/26 22:33:24 jym Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -414,7 +414,7 @@ _isa_dmastart(struct isa_dma_state *ids, int chan, void *addr, bus_size_t nbytes dmaaddr = dmam->dm_segs[0].ds_addr; #ifdef ISADMA_DEBUG - printf(" dmaaddr 0x%lx\n", dmaaddr); + printf(" dmaaddr %#" PRIxPADDR "\n", dmaaddr); __asm(".globl isa_dmastart_aftersync ; isa_dmastart_aftersync:"); #endif diff --git a/sys/dev/pci/cz.c b/sys/dev/pci/cz.c index 2705ee00430..02ca42ef359 100644 --- a/sys/dev/pci/cz.c +++ b/sys/dev/pci/cz.c @@ -1,4 +1,4 @@ -/* $NetBSD: cz.c,v 1.53 2009/11/26 15:17:09 njoly Exp $ */ +/* $NetBSD: cz.c,v 1.54 2010/07/26 22:33:24 jym Exp $ */ /*- * Copyright (c) 2000 Zembu Labs, Inc. @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cz.c,v 1.53 2009/11/26 15:17:09 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cz.c,v 1.54 2010/07/26 22:33:24 jym Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -613,8 +613,8 @@ cz_load_firmware(struct cz_softc *cz) cz->cz_fwctl = bus_space_read_4(cz->cz_win_st, cz->cz_win_sh, ZFIRM_CTRLADDR_OFF); #ifdef CZ_DEBUG - aprint_debug_dev(&cz->cz_dev, "FWCTL structure at offset 0x%08lx\n", - cz->cz_fwctl); + aprint_debug_dev(&cz->cz_dev, "FWCTL structure at offset " + "%#08" PRIxPADDR "\n", cz->cz_fwctl); #endif CZ_FWCTL_WRITE(cz, BRDCTL_C_OS, C_OS_BSD); diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c index e87dbd3c6e6..1090140d541 100644 --- a/sys/dev/pci/if_sk.c +++ b/sys/dev/pci/if_sk.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_sk.c,v 1.67 2010/05/16 11:27:49 phx Exp $ */ +/* $NetBSD: if_sk.c,v 1.68 2010/07/26 22:33:24 jym Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -115,7 +115,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.67 2010/05/16 11:27:49 phx Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.68 2010/07/26 22:33:24 jym Exp $"); #include "rnd.h" @@ -1597,8 +1597,8 @@ skc_attach(device_t parent, device_t self, void *aux) return; } - DPRINTFN(2, ("skc_attach: iobase=%lx, iosize=%lx\n", iobase, - (u_long)iosize)); + DPRINTFN(2, ("skc_attach: iobase=%#" PRIxPADDR ", iosize=%zx\n", + iobase, iosize)); #endif sc->sc_dmatag = pa->pa_dmat; diff --git a/sys/dev/pci/if_wm.c b/sys/dev/pci/if_wm.c index d0da7b43746..4c8176844a1 100644 --- a/sys/dev/pci/if_wm.c +++ b/sys/dev/pci/if_wm.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.213 2010/07/21 15:35:39 msaitoh Exp $ */ +/* $NetBSD: if_wm.c,v 1.214 2010/07/26 22:33:24 jym Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -76,7 +76,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.213 2010/07/21 15:35:39 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.214 2010/07/26 22:33:24 jym Exp $"); #include "rnd.h" @@ -2627,10 +2627,10 @@ wm_start(struct ifnet *ifp) lasttx = nexttx; DPRINTF(WM_DEBUG_TX, - ("%s: TX: desc %d: low 0x%08lx, " - "len 0x%04x\n", + ("%s: TX: desc %d: low %#" PRIxPADDR ", " + "len %#04zx\n", device_xname(sc->sc_dev), nexttx, - curaddr & 0xffffffffUL, (unsigned)curlen)); + curaddr & 0xffffffffUL, curlen)); } } diff --git a/sys/dev/pci/yds.c b/sys/dev/pci/yds.c index 48bd3b69bdd..7aa32c96bf0 100644 --- a/sys/dev/pci/yds.c +++ b/sys/dev/pci/yds.c @@ -1,4 +1,4 @@ -/* $NetBSD: yds.c,v 1.49 2010/02/24 22:38:01 dyoung Exp $ */ +/* $NetBSD: yds.c,v 1.50 2010/07/26 22:33:24 jym Exp $ */ /* * Copyright (c) 2000, 2001 Kazuki Sakamoto and Minoura Makoto. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.49 2010/02/24 22:38:01 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.50 2010/07/26 22:33:24 jym Exp $"); #include "mpu.h" @@ -285,18 +285,18 @@ yds_dump_play_slot(struct yds_softc *sc, int bank) int i, j; uint32_t *p; uint32_t num; - char *pa; + bus_addr_t pa; for (i = 0; i < N_PLAY_SLOTS; i++) { printf("pbankp[%d] = %p,", i*2, sc->pbankp[i*2]); printf("pbankp[%d] = %p\n", i*2+1, sc->pbankp[i*2+1]); } - pa = (char *)DMAADDR(&sc->sc_ctrldata) + sc->pbankoff; - p = (uint32_t *)sc->ptbl; + pa = DMAADDR(&sc->sc_ctrldata) + sc->pbankoff; + p = sc->ptbl; printf("ptbl + 0: %d\n", *p++); for (i = 0; i < N_PLAY_SLOTS; i++) { - printf("ptbl + %d: 0x%x, should be %p\n", + printf("ptbl + %d: %#x, should be %#" PRIxPADDR "\n", i+1, *p, pa + i * sizeof(struct play_slot_ctrl_bank) * N_PLAY_SLOT_CTRL_BANK); @@ -449,8 +449,8 @@ yds_allocate_slots(struct yds_softc *sc) mp = KERNADDR(p); da = DMAADDR(p); - DPRINTF(("mp:%p, DMA addr:%p\n", - mp, (void *)sc->sc_ctrldata.map->dm_segs[0].ds_addr)); + DPRINTF(("mp:%p, DMA addr:%#" PRIxPADDR "\n", + mp, sc->sc_ctrldata.map->dm_segs[0].ds_addr)); memset(mp, 0, memsize); |
