From 973c11b9c3cdde88fe6ca0ef2c5af56a8c49e014 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Wed, 24 Jun 2009 12:31:02 -0700 Subject: [PATCH] AMD64 - Fix many compile-time warnings. int/ptr type mismatches, %llx, etc. --- sys/bus/firewire/fwcrom.c | 2 +- sys/bus/firewire/fwohci.c | 14 ++-- sys/cpu/amd64/include/cpu.h | 1 + sys/dev/disk/md/md.c | 17 +++-- sys/dev/misc/psm/psm.c | 2 +- sys/dev/serial/sio/sio.c | 6 +- sys/dev/video/fb/vga.c | 6 +- sys/emulation/43bsd/43bsd_exit.c | 4 +- sys/kern/imgact_shell.c | 3 +- sys/kern/kern_ccms.c | 56 +++++++++----- sys/kern/kern_checkpoint.c | 2 +- sys/kern/kern_descrip.c | 10 ++- sys/kern/kern_intr.c | 8 +- sys/kern/kern_memio.c | 2 +- sys/kern/kern_sfbuf.c | 2 +- sys/kern/kern_shutdown.c | 3 +- sys/kern/kern_upcall.c | 10 ++- sys/kern/libmchain/subr_mchain.c | 3 +- sys/kern/lwkt_caps.c | 14 ++-- sys/kern/subr_disk.c | 4 +- sys/kern/subr_diskgpt.c | 4 +- sys/kern/subr_disklabel32.c | 4 +- sys/kern/subr_diskmbr.c | 17 +++-- sys/kern/subr_diskslice.c | 7 +- sys/kern/tty.c | 2 +- sys/kern/uipc_domain.c | 4 +- sys/kern/vfs_bio.c | 26 +++++-- sys/kern/vfs_cache.c | 11 ++- sys/kern/vfs_journal.c | 27 ++++--- sys/kern/vfs_rangelock.c | 4 +- sys/kern/vfs_subr.c | 11 +-- sys/libiconv/iconv.c | 6 +- sys/net/ip6fw/ip6_fw.c | 8 +- sys/net/ipfw/ip_fw2.c | 2 +- sys/net/netisr.c | 6 +- sys/netgraph/netgraph/ng_parse.c | 8 +- sys/netgraph/tty/ng_tty.c | 2 +- sys/netproto/smb/smb_subr.c | 7 +- sys/platform/pc64/amd64/db_trace.c | 14 ++-- sys/platform/pc64/amd64/init.c | 8 -- sys/platform/pc64/amd64/nexus.c | 4 +- sys/platform/pc64/amd64/trap.c | 8 +- sys/platform/pc64/amd64/vm_machdep.c | 21 ++++- sys/platform/pc64/isa/clock.c | 2 +- sys/sys/mchain.h | 2 +- sys/vfs/hammer/hammer_blockmap.c | 4 +- sys/vfs/hammer/hammer_btree.c | 110 ++++++++++++++------------- sys/vfs/hammer/hammer_cursor.c | 2 +- sys/vfs/hammer/hammer_inode.c | 3 +- sys/vfs/hammer/hammer_io.c | 4 +- sys/vfs/hammer/hammer_object.c | 26 +++++-- sys/vfs/hammer/hammer_ondisk.c | 14 +++- sys/vfs/hammer/hammer_prune.c | 18 +++-- sys/vfs/hammer/hammer_rebalance.c | 2 +- sys/vfs/hammer/hammer_reblock.c | 6 +- sys/vfs/hammer/hammer_recover.c | 28 ++++--- sys/vfs/hammer/hammer_subs.c | 4 +- sys/vfs/hammer/hammer_transaction.c | 2 +- sys/vfs/hammer/hammer_undo.c | 6 +- sys/vfs/hammer/hammer_vfsops.c | 2 +- sys/vfs/hammer/hammer_vnops.c | 30 +++++--- sys/vfs/hpfs/hpfs_vfsops.c | 2 +- sys/vfs/nfs/nfs_bio.c | 2 +- sys/vfs/nfs/nfs_vnops.c | 11 ++- sys/vfs/nullfs/null_vfsops.c | 4 +- sys/vfs/nwfs/nwfs_vfsops.c | 3 +- sys/vfs/portal/portal_vfsops.c | 2 +- sys/vfs/smbfs/smbfs_smb.c | 3 +- sys/vm/swap_pager.c | 17 +++-- sys/vm/vm_page.h | 16 ++++ sys/vm/vm_pager.c | 2 +- sys/vm/vnode_pager.c | 8 +- 72 files changed, 437 insertions(+), 278 deletions(-) diff --git a/sys/bus/firewire/fwcrom.c b/sys/bus/firewire/fwcrom.c index c1aea879e2..bb10b1a363 100644 --- a/sys/bus/firewire/fwcrom.c +++ b/sys/bus/firewire/fwcrom.c @@ -461,7 +461,7 @@ crom_add_simple_text(struct crom_src *src, struct crom_chunk *parent, len = strlen(buf); if (len > MAX_TEXT) { #if defined(__DragonFly__) || __FreeBSD_version < 500000 - kprintf("text(%d) truncated to %d.\n", len, MAX_TEXT); + kprintf("text(%d) truncated to %lu.\n", len, MAX_TEXT); #else kprintf("text(%d) truncated to %td.\n", len, MAX_TEXT); #endif diff --git a/sys/bus/firewire/fwohci.c b/sys/bus/firewire/fwohci.c index 59810add3d..894e41cc6c 100644 --- a/sys/bus/firewire/fwohci.c +++ b/sys/bus/firewire/fwohci.c @@ -2371,10 +2371,10 @@ print_db(struct fwohcidb_tr *db_tr, struct fwohcidb *db, key = cmd & OHCI_KEY_MASK; stat = res >> OHCI_STATUS_SHIFT; #if defined(__DragonFly__) || __FreeBSD_version < 500000 - kprintf("%08x %s %s %s %s %5d %08x %08x %04x:%04x", - db_tr->bus_addr, + kprintf("%08x %s %s %s %s %5d %08lx %08lx %04x:%04x", + (unsigned int)db_tr->bus_addr, #else - kprintf("%08jx %s %s %s %s %5d %08x %08x %04x:%04x", + kprintf("%08jx %s %s %s %s %5d %08lx %08lx %04x:%04x", (uintmax_t)db_tr->bus_addr, #endif dbcode[(cmd >> 28) & 0xf], @@ -2382,10 +2382,10 @@ print_db(struct fwohcidb_tr *db_tr, struct fwohcidb *db, dbcond[(cmd >> 20) & 0x3], dbcond[(cmd >> 18) & 0x3], cmd & OHCI_COUNT_MASK, - FWOHCI_DMA_READ(db[i].db.desc.addr), - FWOHCI_DMA_READ(db[i].db.desc.depend), - stat, - res & OHCI_COUNT_MASK); + (u_long)FWOHCI_DMA_READ(db[i].db.desc.addr), + (u_long)FWOHCI_DMA_READ(db[i].db.desc.depend), + (u_int)stat, + (u_int)(res & OHCI_COUNT_MASK)); if(stat & 0xff00){ kprintf(" %s%s%s%s%s%s %s(%x)\n", stat & OHCI_CNTL_DMA_RUN ? "RUN," : "", diff --git a/sys/cpu/amd64/include/cpu.h b/sys/cpu/amd64/include/cpu.h index c4af70b6c9..20188125a1 100644 --- a/sys/cpu/amd64/include/cpu.h +++ b/sys/cpu/amd64/include/cpu.h @@ -91,6 +91,7 @@ } #ifdef _KERNEL +struct lwp; void fork_trampoline (void); void generic_lwp_return (struct lwp *, struct trapframe *); void fork_return (struct lwp *, struct trapframe *); diff --git a/sys/dev/disk/md/md.c b/sys/dev/disk/md/md.c index d1e74a7d60..103a4865eb 100644 --- a/sys/dev/disk/md/md.c +++ b/sys/dev/disk/md/md.c @@ -136,7 +136,8 @@ mdstrategy(struct dev_strategy_args *ap) if (md_debug > 1) { kprintf("mdstrategy(%p) %s %08x, %lld, %d, %p)\n", - bp, devtoname(dev), bp->b_flags, bio->bio_offset, + bp, devtoname(dev), bp->b_flags, + (long long)bio->bio_offset, bp->b_bcount, bp->b_data); } bio->bio_driver_info = dev; @@ -163,7 +164,8 @@ mdstrategy_malloc(struct dev_strategy_args *ap) if (md_debug > 1) kprintf("mdstrategy_malloc(%p) %s %08xx, %lld, %d, %p)\n", - bp, devtoname(dev), bp->b_flags, bio->bio_offset, + bp, devtoname(dev), bp->b_flags, + (long long)bio->bio_offset, bp->b_bcount, bp->b_data); sc = dev->si_drv1; @@ -206,12 +208,12 @@ mdstrategy_malloc(struct dev_strategy_args *ap) while (nsec--) { if (secno < sc->nsecp) { secpp = &sc->secp[secno]; - if ((u_int)*secpp > 255) { + if ((u_int)(uintptr_t)*secpp > 255) { secp = *secpp; secval = 0; } else { secp = 0; - secval = (u_int) *secpp; + secval = (u_int)(uintptr_t)*secpp; } } else { secpp = 0; @@ -248,7 +250,7 @@ mdstrategy_malloc(struct dev_strategy_args *ap) if (secp) FREE(secp, M_MDSECT); if (secpp) - *secpp = (u_char *)uc; + *secpp = (u_char *)(uintptr_t)uc; } else { if (!secpp) { MALLOC(secpp, u_char **, (secno + nsec + 1) * sizeof(u_char *), M_MD, M_WAITOK | M_ZERO); @@ -261,7 +263,7 @@ mdstrategy_malloc(struct dev_strategy_args *ap) if (i == DEV_BSIZE) { if (secp) FREE(secp, M_MDSECT); - *secpp = (u_char *)uc; + *secpp = (u_char *)(uintptr_t)uc; } else { if (!secp) MALLOC(secp, u_char *, DEV_BSIZE, M_MDSECT, M_WAITOK); @@ -298,7 +300,8 @@ mdstrategy_preload(struct dev_strategy_args *ap) if (md_debug > 1) kprintf("mdstrategy_preload(%p) %s %08x, %lld, %d, %p)\n", - bp, devtoname(dev), bp->b_flags, bio->bio_offset, + bp, devtoname(dev), bp->b_flags, + (long long)bio->bio_offset, bp->b_bcount, bp->b_data); sc = dev->si_drv1; diff --git a/sys/dev/misc/psm/psm.c b/sys/dev/misc/psm/psm.c index e786100999..39d52e5aac 100644 --- a/sys/dev/misc/psm/psm.c +++ b/sys/dev/misc/psm/psm.c @@ -1197,7 +1197,7 @@ psmprobe(device_t dev) RF_ACTIVE); if (sc->intr == NULL) { kprintf("psm%d: unable to allocate the IRQ resource (%d).\n", - unit, irq); + unit, (int)irq); endprobe(ENXIO); } else { bus_release_resource(dev, SYS_RES_IRQ, rid, sc->intr); diff --git a/sys/dev/serial/sio/sio.c b/sys/dev/serial/sio/sio.c index 441e792839..57ed9eafa4 100644 --- a/sys/dev/serial/sio/sio.c +++ b/sys/dev/serial/sio/sio.c @@ -2928,7 +2928,7 @@ siocnprobe(struct consdev *cp) crit_exit(); if (COM_CONSOLE(flags) && !COM_LLCONSOLE(flags)) { cp->cn_probegood = 1; - cp->cn_private = (void *)unit; + cp->cn_private = (void *)(intptr_t)unit; cp->cn_pri = COM_FORCECONSOLE(flags) || boothowto & RB_SERIAL ? CN_REMOTE : CN_NORMAL; @@ -2940,7 +2940,7 @@ siocnprobe(struct consdev *cp) siogdbiobase = iobase; siogdbunit = unit; #if DDB > 0 - cp->cn_gdbprivate = (void *)unit; + cp->cn_gdbprivate = (void *)(intptr_t)unit; gdb_tab = cp; #endif } @@ -2960,7 +2960,7 @@ siocnprobe(struct consdev *cp) kprintf("configuration file (currently sio only).\n"); siogdbiobase = siocniobase; siogdbunit = siocnunit; - cp->cn_gdbprivate = (void *)siocnunit; + cp->cn_gdbprivate = (void *)(intptr_t)siocnunit; gdb_tab = cp; } #endif diff --git a/sys/dev/video/fb/vga.c b/sys/dev/video/fb/vga.c index 11cb82c434..57f82b9d08 100644 --- a/sys/dev/video/fb/vga.c +++ b/sys/dev/video/fb/vga.c @@ -1912,8 +1912,12 @@ vga_mmap_buf(video_adapter_t *adp, vm_offset_t offset, int prot) if (offset > adp->va_window_size - PAGE_SIZE) return -1; -#ifdef __i386__ +#if defined(__i386__) return i386_btop(adp->va_info.vi_window + offset); +#elif defined(__amd64__) + return amd64_btop(adp->va_info.vi_window + offset); +#else +#error "vga_mmap_buf needs to return something" #endif } diff --git a/sys/emulation/43bsd/43bsd_exit.c b/sys/emulation/43bsd/43bsd_exit.c index 5b985ece61..838b06e051 100644 --- a/sys/emulation/43bsd/43bsd_exit.c +++ b/sys/emulation/43bsd/43bsd_exit.c @@ -64,8 +64,10 @@ int sys_owait(struct owait_args *uap) { int error, status; + int res = 0; - error = kern_wait(WAIT_ANY, &status, 0, NULL, &uap->sysmsg_fds[0]); + error = kern_wait(WAIT_ANY, &status, 0, NULL, &res); + uap->sysmsg_fds[0] = res; if (error == 0) uap->sysmsg_fds[1] = status; diff --git a/sys/kern/imgact_shell.c b/sys/kern/imgact_shell.c index 60a81621ce..1cdebabf92 100644 --- a/sys/kern/imgact_shell.c +++ b/sys/kern/imgact_shell.c @@ -49,7 +49,8 @@ exec_shell_imgact(struct image_params *imgp) { const char *image_header = imgp->image_header; const char *ihp; - int error, length, offset; + size_t length, offset; + int error; /* a shell script? */ if (((const short *) image_header)[0] != SHELLMAGIC) diff --git a/sys/kern/kern_ccms.c b/sys/kern/kern_ccms.c index 56b2c29a90..6130d119e6 100644 --- a/sys/kern/kern_ccms.c +++ b/sys/kern/kern_ccms.c @@ -277,8 +277,10 @@ ccms_lock_get_match(ccms_cst_t cst, void *arg) } else { ++cst->sharecount; if (ccms_enable >= 9) { - kprintf("CST SHARE %d %lld-%lld\n", cst->sharecount, - cst->beg_offset, cst->end_offset); + kprintf("CST SHARE %d %lld-%lld\n", + cst->sharecount, + (long long)cst->beg_offset, + (long long)cst->end_offset); } } break; @@ -288,8 +290,10 @@ ccms_lock_get_match(ccms_cst_t cst, void *arg) } else { --cst->sharecount; if (ccms_enable >= 9) { - kprintf("CST EXCLS %d %lld-%lld\n", cst->sharecount, - cst->beg_offset, cst->end_offset); + kprintf("CST EXCLS %d %lld-%lld\n", + cst->sharecount, + (long long)cst->beg_offset, + (long long)cst->end_offset); } } break; @@ -300,8 +304,10 @@ ccms_lock_get_match(ccms_cst_t cst, void *arg) --cst->sharecount; ++cst->modifycount; if (ccms_enable >= 9) { - kprintf("CST MODXL %d %lld-%lld\n", cst->sharecount, - cst->beg_offset, cst->end_offset); + kprintf("CST MODXL %d %lld-%lld\n", + cst->sharecount, + (long long)cst->beg_offset, + (long long)cst->end_offset); } } break; @@ -361,8 +367,10 @@ ccms_lock_redo_match(ccms_cst_t cst, void *arg) info->coll_cst = cst; } else { if (ccms_enable >= 9) { - kprintf("CST SHARE %d %lld-%lld\n", cst->sharecount, - cst->beg_offset, cst->end_offset); + kprintf("CST SHARE %d %lld-%lld\n", + cst->sharecount, + (long long)cst->beg_offset, + (long long)cst->end_offset); } ++cst->sharecount; } @@ -373,8 +381,10 @@ ccms_lock_redo_match(ccms_cst_t cst, void *arg) } else { --cst->sharecount; if (ccms_enable >= 9) { - kprintf("CST EXCLS %d %lld-%lld\n", cst->sharecount, - cst->beg_offset, cst->end_offset); + kprintf("CST EXCLS %d %lld-%lld\n", + cst->sharecount, + (long long)cst->beg_offset, + (long long)cst->end_offset); } } break; @@ -385,8 +395,10 @@ ccms_lock_redo_match(ccms_cst_t cst, void *arg) --cst->sharecount; ++cst->modifycount; if (ccms_enable >= 9) { - kprintf("CST MODXL %d %lld-%lld\n", cst->sharecount, - cst->beg_offset, cst->end_offset); + kprintf("CST MODXL %d %lld-%lld\n", + cst->sharecount, + (long long)cst->beg_offset, + (long long)cst->end_offset); } } break; @@ -439,7 +451,9 @@ ccms_lock_put_match(ccms_cst_t cst, void *arg) --cst->sharecount; if (ccms_enable >= 9) { kprintf("CST UNSHR %d %lld-%lld (%d)\n", cst->sharecount, - cst->beg_offset, cst->end_offset, cst->blocked); + (long long)cst->beg_offset, + (long long)cst->end_offset, + cst->blocked); } if (cst->blocked && cst->sharecount == 0) { cst->blocked = 0; @@ -451,7 +465,9 @@ ccms_lock_put_match(ccms_cst_t cst, void *arg) ++cst->sharecount; if (ccms_enable >= 9) { kprintf("CST UNEXC %d %lld-%lld (%d)\n", cst->sharecount, - cst->beg_offset, cst->end_offset, cst->blocked); + (long long)cst->beg_offset, + (long long)cst->end_offset, + cst->blocked); } if (cst->blocked && cst->sharecount == 0) { cst->blocked = 0; @@ -464,7 +480,9 @@ ccms_lock_put_match(ccms_cst_t cst, void *arg) --cst->modifycount; if (ccms_enable >= 9) { kprintf("CST UNMOD %d %lld-%lld (%d)\n", cst->sharecount, - cst->beg_offset, cst->end_offset, cst->blocked); + (long long)cst->beg_offset, + (long long)cst->end_offset, + cst->blocked); } if (cst->blocked && cst->sharecount == 0) { cst->blocked = 0; @@ -513,7 +531,9 @@ ccms_lock_put_match(ccms_cst_t cst, void *arg) cst->lrefs = ocst->lrefs; if (ccms_enable >= 9) { kprintf("MERGELEFT %p %lld-%lld (%d)\n", - ocst, cst->beg_offset, cst->end_offset, + ocst, + (long long)cst->beg_offset, + (long long)cst->end_offset, cst->blocked); } if (ocst->blocked) { @@ -539,7 +559,9 @@ ccms_lock_put_match(ccms_cst_t cst, void *arg) cst->rrefs = ocst->rrefs; if (ccms_enable >= 9) { kprintf("MERGERIGHT %p %lld-%lld\n", - ocst, cst->beg_offset, cst->end_offset); + ocst, + (long long)cst->beg_offset, + (long long)cst->end_offset); } objcache_put(ccms_oc, ocst); } diff --git a/sys/kern/kern_checkpoint.c b/sys/kern/kern_checkpoint.c index 38324643d7..e2c176b620 100644 --- a/sys/kern/kern_checkpoint.c +++ b/sys/kern/kern_checkpoint.c @@ -359,7 +359,7 @@ elf_demarshalnotes(void *src, prpsinfo_t *psinfo, prstatus_t *status, { int i; int error; - int off = 0; + size_t off = 0; TRACE_ENTER; error = elf_getnote(src, &off, "FreeBSD", NT_PRPSINFO, diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 766799c232..6c500fe83f 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -194,8 +194,10 @@ int sys_dup2(struct dup2_args *uap) { int error; + int fd = 0; - error = kern_dup(DUP_FIXED, uap->from, uap->to, uap->sysmsg_fds); + error = kern_dup(DUP_FIXED, uap->from, uap->to, &fd); + uap->sysmsg_fds[0] = fd; return (error); } @@ -209,8 +211,10 @@ int sys_dup(struct dup_args *uap) { int error; + int fd = 0; - error = kern_dup(DUP_VARIABLE, uap->fd, 0, uap->sysmsg_fds); + error = kern_dup(DUP_VARIABLE, uap->fd, 0, &fd); + uap->sysmsg_fds[0] = fd; return (error); } @@ -2114,7 +2118,7 @@ fdcheckstd(struct proc *p) struct nlookupdata nd; struct filedesc *fdp; struct file *fp; - register_t retval; + int retval; int i, error, flags, devnull; fdp = p->p_fd; diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c index a5ad65c027..b3369ea553 100644 --- a/sys/kern/kern_intr.c +++ b/sys/kern/kern_intr.c @@ -237,7 +237,7 @@ register_int(int intr, inthand2_t *handler, void *arg, const char *name, */ if (info->i_state == ISTATE_NOTHREAD) { info->i_state = ISTATE_NORMAL; - lwkt_create((void *)ithread_handler, (void *)intr, NULL, + lwkt_create((void *)ithread_handler, (void *)(intptr_t)intr, NULL, &info->i_thread, TDF_STOPREQ|TDF_INTTHREAD|TDF_MPSAFE, -1, "ithread %d", intr); if (intr >= FIRST_SOFTINT) @@ -559,7 +559,7 @@ ithread_livelock_wakeup(systimer_t st) { struct intr_info *info; - info = &intr_info_ary[(int)st->data]; + info = &intr_info_ary[(int)(intptr_t)st->data]; if (info->i_state != ISTATE_NOTHREAD) lwkt_schedule(&info->i_thread); } @@ -746,7 +746,7 @@ ithread_handler(void *arg) u_int ill_count; /* interrupt livelock counter */ ill_count = 0; - intr = (int)arg; + intr = (int)(intptr_t)arg; info = &intr_info_ary[intr]; list = &info->i_reclist; gd = mycpu; @@ -876,7 +876,7 @@ ithread_handler(void *arg) else if (use_limit > 500000) use_limit = 500000; systimer_init_periodic_nq(&ill_timer, ithread_livelock_wakeup, - (void *)intr, use_limit); + (void *)(intptr_t)intr, use_limit); /* fall through */ case ISTATE_LIVELOCKED: /* diff --git a/sys/kern/kern_memio.c b/sys/kern/kern_memio.c index 6883778901..032b293d4c 100644 --- a/sys/kern/kern_memio.c +++ b/sys/kern/kern_memio.c @@ -176,7 +176,7 @@ mmrw(cdev_t dev, struct uio *uio, int flags) v &= ~PAGE_MASK; pmap_kenter((vm_offset_t)ptvmmap, v); o = (int)uio->uio_offset & PAGE_MASK; - c = (u_int)(PAGE_SIZE - ((int)iov->iov_base & PAGE_MASK)); + c = (u_int)(PAGE_SIZE - ((uintptr_t)iov->iov_base & PAGE_MASK)); c = min(c, (u_int)(PAGE_SIZE - o)); c = min(c, (u_int)iov->iov_len); error = uiomove((caddr_t)&ptvmmap[o], (int)c, uio); diff --git a/sys/kern/kern_sfbuf.c b/sys/kern/kern_sfbuf.c index cb8b0a4e67..487a0915d7 100644 --- a/sys/kern/kern_sfbuf.c +++ b/sys/kern/kern_sfbuf.c @@ -74,7 +74,7 @@ sf_buf_hash(vm_page_t m) { int hv; - hv = ((int)m / sizeof(vm_page_t)) + ((int)m >> 12); + hv = ((int)(intptr_t)m / sizeof(vm_page_t)) + ((int)(intptr_t)m >> 12); return(hv & sf_buf_hashmask); } diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index 41b352c93c..4d169f231f 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -661,7 +661,8 @@ dumpsys(void) return; dumpsize = Maxmem; kprintf("\ndumping to dev %s, blockno %lld\n", - devtoname(dumpdev), dumplo64); + devtoname(dumpdev), + (long long)dumplo64); kprintf("dump "); error = dev_ddump(dumpdev); if (error == 0) { diff --git a/sys/kern/kern_upcall.c b/sys/kern/kern_upcall.c index 0d05377700..e77a59672e 100644 --- a/sys/kern/kern_upcall.c +++ b/sys/kern/kern_upcall.c @@ -138,10 +138,11 @@ sys_upc_control(struct upc_control_args *uap) error = (uap->upcid == -1) ? 0 : ENOENT; for (vu = vms->vm_upcalls; vu; vu = vu->vu_next) { if (vu->vu_id == uap->upcid || - (uap->upcid == -1 && vu->vu_pending >= (int)uap->data && vu->vu_lwp == lp) + (uap->upcid == -1 && + vu->vu_pending >= (int)(intptr_t)uap->data && vu->vu_lwp == lp) ) { - if (vu->vu_pending < (int)uap->data) - vu->vu_pending = (int)uap->data; + if (vu->vu_pending < (int)(intptr_t)uap->data) + vu->vu_pending = (int)(intptr_t)uap->data; error = 0; targlp = vu->vu_lwp; targlp->lwp_proc->p_flag |= P_UPCALLPEND; /* XXX lwp flags */ @@ -228,7 +229,8 @@ sys_upc_control(struct upc_control_args *uap) error = (uap->upcid == -1) ? 0 : ENOENT; for (vu = vms->vm_upcalls; vu; vu = vu->vu_next) { if (vu->vu_id == uap->upcid || - (uap->upcid == -1 && vu->vu_pending >= (int)uap->data && vu->vu_lwp == lp) + (uap->upcid == -1 && + vu->vu_pending >= (int)(intptr_t)uap->data && vu->vu_lwp == lp) ) { error = 0; if (uap->upcid == -1) diff --git a/sys/kern/libmchain/subr_mchain.c b/sys/kern/libmchain/subr_mchain.c index ac008bfa8b..510124ebaf 100644 --- a/sys/kern/libmchain/subr_mchain.c +++ b/sys/kern/libmchain/subr_mchain.c @@ -202,7 +202,8 @@ mb_put_mem(struct mbchain *mbp, c_caddr_t source, int size, int type) struct mbuf *m; caddr_t dst; c_caddr_t src; - int cplen, error, mleft, count; + int error, mleft, count; + size_t cplen; m = mbp->mb_cur; mleft = mbp->mb_mleft; diff --git a/sys/kern/lwkt_caps.c b/sys/kern/lwkt_caps.c index 1384937851..514518a088 100644 --- a/sys/kern/lwkt_caps.c +++ b/sys/kern/lwkt_caps.c @@ -68,7 +68,7 @@ static int caps_process_msg(caps_kinfo_t caps, caps_kmsg_t msg, struct caps_sys_get_args *uap); static void caps_free(caps_kinfo_t caps); static void caps_free_msg(caps_kmsg_t msg); -static int caps_name_check(const char *name, int len); +static int caps_name_check(const char *name, size_t len); static caps_kinfo_t caps_free_msg_mcaps(caps_kmsg_t msg); static caps_kinfo_t kern_caps_sys_service(const char *name, uid_t uid, gid_t gid, struct ucred *cred, @@ -329,9 +329,9 @@ caps_free_msg(caps_kmsg_t msg) * Validate the service name */ static int -caps_name_check(const char *name, int len) +caps_name_check(const char *name, size_t len) { - int i; + size_t i; char c; for (i = len - 1; i >= 0; --i) { @@ -573,14 +573,14 @@ sys_caps_sys_service(struct caps_sys_service_args *uap) struct ucred *cred = curproc->p_ucred; char name[CAPS_MAXNAMELEN]; caps_kinfo_t caps; - int len; + size_t len; int error; if (caps_enabled == 0) return(EOPNOTSUPP); if ((error = copyinstr(uap->name, name, CAPS_MAXNAMELEN, &len)) != 0) return(error); - if (--len <= 0) + if ((ssize_t)--len <= 0) return(EINVAL); if ((error = caps_name_check(name, len)) != 0) return(error); @@ -607,14 +607,14 @@ sys_caps_sys_client(struct caps_sys_client_args *uap) struct ucred *cred = curproc->p_ucred; char name[CAPS_MAXNAMELEN]; caps_kinfo_t caps; - int len; + size_t len; int error; if (caps_enabled == 0) return(EOPNOTSUPP); if ((error = copyinstr(uap->name, name, CAPS_MAXNAMELEN, &len)) != 0) return(error); - if (--len <= 0) + if ((ssize_t)--len <= 0) return(EINVAL); if ((error = caps_name_check(name, len)) != 0) return(error); diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index d893b282e0..d82ca84e99 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -654,7 +654,9 @@ diskerr(struct bio *bio, cdev_t dev, const char *what, int pri, int donecnt) } sname = dsname(dev, unit, slice, part, partname); kprintf("%s%s: %s %sing ", sname, partname, what, term); - kprintf("offset %012llx for %d", bio->bio_offset, bp->b_bcount); + kprintf("offset %012llx for %d", + (long long)bio->bio_offset, + bp->b_bcount); if (donecnt) kprintf(" (%d bytes completed)", donecnt); } diff --git a/sys/kern/subr_diskgpt.c b/sys/kern/subr_diskgpt.c index 4906acaa14..ff9d8dc127 100644 --- a/sys/kern/subr_diskgpt.c +++ b/sys/kern/subr_diskgpt.c @@ -146,7 +146,9 @@ gptinit(cdev_t dev, struct disk_info *info, struct diskslices **sspp) dev_dstrategy(wdev, &bp2->b_bio1); if (biowait(bp2) != 0) { kprintf("%s: reading GPT partition table @ %lld: error %d\n", - dname, bp2->b_bio1.bio_offset, bp2->b_error); + dname, + (long long)bp2->b_bio1.bio_offset, + bp2->b_error); error = EIO; goto done; } diff --git a/sys/kern/subr_disklabel32.c b/sys/kern/subr_disklabel32.c index 47d1919875..3372fe4911 100644 --- a/sys/kern/subr_disklabel32.c +++ b/sys/kern/subr_disklabel32.c @@ -602,7 +602,9 @@ static void slice_info(const char *sname, struct diskslice *sp) { kprintf("%s: start %llu, end %llu, size %llu\n", sname, - sp->ds_offset, sp->ds_offset + sp->ds_size - 1, sp->ds_size); + (long long)sp->ds_offset, + (long long)sp->ds_offset + sp->ds_size - 1, + (long long)sp->ds_size); } struct disklabel_ops disklabel32_ops = { diff --git a/sys/kern/subr_diskmbr.c b/sys/kern/subr_diskmbr.c index b353566eae..68f255c835 100644 --- a/sys/kern/subr_diskmbr.c +++ b/sys/kern/subr_diskmbr.c @@ -352,7 +352,8 @@ check_part(char *sname, struct dos_partition *dp, u_int64_t offset, || (dp->dp_scyl == 255 && dp->dp_shd == 255 && dp->dp_ssect == 255)) { TRACE(("%s: C/H/S start %d/%d/%d, start %llu: allow\n", - sname, chs_scyl, dp->dp_shd, chs_ssect, ssector1)); + sname, chs_scyl, dp->dp_shd, chs_ssect, + (long long)ssector1)); ssector = ssector1; } @@ -376,23 +377,25 @@ check_part(char *sname, struct dos_partition *dp, u_int64_t offset, || (dp->dp_ecyl == 255 && dp->dp_ehd == 255 && dp->dp_esect == 255)) { TRACE(("%s: C/H/S end %d/%d/%d, end %llu: allow\n", - sname, chs_ecyl, dp->dp_ehd, chs_esect, esector1)); + sname, chs_ecyl, dp->dp_ehd, chs_esect, + (long long)esector1)); esector = esector1; } error = (ssector == ssector1 && esector == esector1) ? 0 : EINVAL; if (bootverbose) kprintf("%s: type 0x%x, start %llu, end = %llu, size %lu %s\n", - sname, dp->dp_typ, ssector1, esector1, - (u_long)dp->dp_size, error ? "" : ": OK"); + sname, dp->dp_typ, + (long long)ssector1, (long long)esector1, + (u_long)dp->dp_size, (error ? "" : ": OK")); if (ssector != ssector1 && bootverbose) kprintf("%s: C/H/S start %d/%d/%d (%llu) != start %llu: invalid\n", sname, chs_scyl, dp->dp_shd, chs_ssect, - ssector, ssector1); + (long long)ssector, (long long)ssector1); if (esector != esector1 && bootverbose) kprintf("%s: C/H/S end %d/%d/%d (%llu) != end %llu: invalid\n", sname, chs_ecyl, dp->dp_ehd, chs_esect, - esector, esector1); + (long long)esector, (long long)esector1); return (error); } @@ -526,7 +529,7 @@ mbr_setslice(char *sname, struct disk_info *info, struct diskslice *sp, } else { kprintf("%s: slice extends beyond end of disk: " "truncating from %lu to %llu sectors\n", - sname, (u_long)dp->dp_size, size); + sname, (long long)dp->dp_size, size); } sp->ds_offset = offset; sp->ds_size = size; diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c index 3cd99c0e12..3c08c09996 100644 --- a/sys/kern/subr_diskslice.c +++ b/sys/kern/subr_diskslice.c @@ -114,7 +114,7 @@ dscheck(cdev_t dev, struct bio *bio, struct diskslices *ssp) if (bio->bio_offset < 0) { kprintf("dscheck(%s): negative bio_offset %lld\n", - devtoname(dev), bio->bio_offset); + devtoname(dev), (long long)bio->bio_offset); goto bad; } if (slice >= ssp->dss_nslices) { @@ -236,7 +236,8 @@ doshift: ((ssp->dss_secsize << 1) - 1)) { kprintf("%s: invalid BIO offset, not sector aligned or" " invalid sector size (not power of 2) %08llx %d\n", - devtoname(dev), bio->bio_offset, ssp->dss_secsize); + devtoname(dev), (long long)bio->bio_offset, + ssp->dss_secsize); goto bad; } @@ -283,7 +284,7 @@ bad_bcount: bad_blkno: kprintf( "dscheck(%s): bio_offset %lld is not on a sector boundary (ssize %d)\n", - devtoname(dev), bio->bio_offset, ssp->dss_secsize); + devtoname(dev), (long long)bio->bio_offset, ssp->dss_secsize); bad: bp->b_error = EINVAL; /* fall through */ diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 927971daa2..603807ff00 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -2620,7 +2620,7 @@ sysctl_kern_ttys(SYSCTL_HANDLER_ARGS) SLIST_FOREACH(tp, &tty_list, t_list) { t = *tp; if (t.t_dev) - t.t_dev = (cdev_t)dev2udev(t.t_dev); + t.t_dev = (cdev_t)(uintptr_t)dev2udev(t.t_dev); error = SYSCTL_OUT(req, (caddr_t)&t, sizeof(t)); if (error) return (error); diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index 774f90e260..4fa3067a1e 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -97,8 +97,8 @@ net_init_domain(struct domain *dp) for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) { pu = pr->pr_usrreqs; if (pu == NULL) - panic("domaininit: %ssw[%d] has no usrreqs!", - dp->dom_name, pr - dp->dom_protosw); + panic("domaininit: %ssw[%ld] has no usrreqs!", + dp->dom_name, (long)(pr - dp->dom_protosw)); PRU_NOTSUPP(pu, accept); PRU_NOTSUPP(pu, bind); PRU_NOTSUPP(pu, connect); diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 8b04304ccf..e894a59ae5 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -2485,7 +2485,9 @@ loop: * as well. */ if (bp->b_vp != vp || bp->b_loffset != loffset) { - kprintf("Warning buffer %p (vp %p loffset %lld) was recycled\n", bp, vp, loffset); + kprintf("Warning buffer %p (vp %p loffset %lld) " + "was recycled\n", + bp, vp, (long long)loffset); BUF_UNLOCK(bp); goto loop; } @@ -2513,7 +2515,9 @@ loop: * block number translation. */ if ((bp->b_flags & B_INVAL) && (bp->b_bio2.bio_offset != NOOFFSET)) { - kprintf("Warning invalid buffer %p (vp %p loffset %lld) did not have cleared bio_offset cache\n", bp, vp, loffset); + kprintf("Warning invalid buffer %p (vp %p loffset %lld)" + " did not have cleared bio_offset cache\n", + bp, vp, (long long)loffset); clearbiocache(&bp->b_bio2); } @@ -3269,13 +3273,14 @@ biodone(struct bio *bio) (int) m->pindex, (int)(foff >> 32), (int) foff & 0xffffffff, resid, i); if (!vn_isdisk(vp, NULL)) - kprintf(" iosize: %ld, loffset: %lld, flags: 0x%08x, npages: %d\n", + kprintf(" iosize: %ld, loffset: %lld, " + "flags: 0x%08x, npages: %d\n", bp->b_vp->v_mount->mnt_stat.f_iosize, - bp->b_loffset, + (long long)bp->b_loffset, bp->b_flags, bp->b_xio.xio_npages); else kprintf(" VDEV, loffset: %lld, flags: 0x%08x, npages: %d\n", - bp->b_loffset, + (long long)bp->b_loffset, bp->b_flags, bp->b_xio.xio_npages); kprintf(" valid: 0x%x, dirty: 0x%x, wired: %d\n", m->valid, m->dirty, m->wire_count); @@ -3766,8 +3771,10 @@ vm_hold_free_pages(struct buf *bp, vm_offset_t from, vm_offset_t to) p = bp->b_xio.xio_pages[index]; if (p && (index < bp->b_xio.xio_npages)) { if (p->busy) { - kprintf("vm_hold_free_pages: doffset: %lld, loffset: %lld\n", - bp->b_bio2.bio_offset, bp->b_loffset); + kprintf("vm_hold_free_pages: doffset: %lld, " + "loffset: %lld\n", + (long long)bp->b_bio2.bio_offset, + (long long)bp->b_loffset); } bp->b_xio.xio_pages[index] = NULL; pmap_kremove(pg); @@ -3949,7 +3956,10 @@ DB_SHOW_COMMAND(buffer, db_show_buffer) "b_resid = %d\n, b_data = %p, " "bio_offset(disk) = %lld, bio_offset(phys) = %lld\n", bp->b_error, bp->b_bufsize, bp->b_bcount, bp->b_resid, - bp->b_data, bp->b_bio2.bio_offset, (bp->b_bio2.bio_next ? bp->b_bio2.bio_next->bio_offset : (off_t)-1)); + bp->b_data, + (long long)bp->b_bio2.bio_offset, + (long long)(bp->b_bio2.bio_next ? + bp->b_bio2.bio_next->bio_offset : (off_t)-1)); if (bp->b_xio.xio_npages) { int i; db_printf("b_xio.xio_npages = %d, pages(OBJ, IDX, PA): ", diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index dc9ba6d187..ef5c836402 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -1551,8 +1551,12 @@ cache_inefficient_scan(struct nchandle *nch, struct ucred *cred, return (error); if ((error = cache_vref(nch, cred, &pvp)) != 0) return (error); - if (ncvp_debug) - kprintf("inefficient_scan: directory iosize %ld vattr fileid = %lld\n", vat.va_blocksize, vat.va_fileid); + if (ncvp_debug) { + kprintf("inefficient_scan: directory iosize %ld " + "vattr fileid = %lld\n", + vat.va_blocksize, + (long long)vat.va_fileid); + } /* * Use the supplied fakename if not NULL. Fake names are typically @@ -1601,7 +1605,8 @@ again: if (ncvp_debug) { kprintf("cache_inefficient_scan: " "MATCHED inode %lld path %s/%*.*s\n", - vat.va_fileid, nch->ncp->nc_name, + (long long)vat.va_fileid, + nch->ncp->nc_name, den->d_namlen, den->d_namlen, den->d_name); } diff --git a/sys/kern/vfs_journal.c b/sys/kern/vfs_journal.c index 32f625434c..58bd1208b0 100644 --- a/sys/kern/vfs_journal.c +++ b/sys/kern/vfs_journal.c @@ -164,10 +164,10 @@ journal_wthread(void *info) { struct journal *jo = info; struct journal_rawrecbeg *rawp; - int bytes; int error; - int avail; - int res; + size_t avail; + size_t bytes; + size_t res; for (;;) { /* @@ -254,7 +254,8 @@ journal_wthread(void *info) bytes = res; jo->fifo.rindex += bytes; error = fp_write(jo->fp, - jo->fifo.membase + ((jo->fifo.rindex - bytes) & jo->fifo.mask), + jo->fifo.membase + + ((jo->fifo.rindex - bytes) & jo->fifo.mask), bytes, &res, UIO_SYSSPACE); if (error) { kprintf("journal_thread(%s) write, error %d\n", jo->id, error); @@ -298,8 +299,8 @@ journal_rthread(void *info) struct journal *jo = info; int64_t transid; int error; - int count; - int bytes; + size_t count; + size_t bytes; transid = 0; error = 0; @@ -345,7 +346,8 @@ journal_rthread(void *info) bytes = jo->fifo.rindex - jo->fifo.xindex; if (bytes == 0) { - kprintf("warning: unsent data acknowledged transid %08llx\n", transid); + kprintf("warning: unsent data acknowledged transid %08llx\n", + (long long)transid); tsleep(&jo->fifo.xindex, 0, "jrseq", hz); transid = 0; continue; @@ -364,7 +366,9 @@ journal_rthread(void *info) */ if (rawp->transid < transid) { #if 1 - kprintf("ackskip %08llx/%08llx\n", rawp->transid, transid); + kprintf("ackskip %08llx/%08llx\n", + (long long)rawp->transid, + (long long)transid); #endif jo->fifo.xindex += (rawp->recsize + 15) & ~15; jo->total_acked += (rawp->recsize + 15) & ~15; @@ -376,7 +380,9 @@ journal_rthread(void *info) } if (rawp->transid == transid) { #if 1 - kprintf("ackskip %08llx/%08llx\n", rawp->transid, transid); + kprintf("ackskip %08llx/%08llx\n", + (long long)rawp->transid, + (long long)transid); #endif jo->fifo.xindex += (rawp->recsize + 15) & ~15; jo->total_acked += (rawp->recsize + 15) & ~15; @@ -387,7 +393,8 @@ journal_rthread(void *info) transid = 0; continue; } - kprintf("warning: unsent data(2) acknowledged transid %08llx\n", transid); + kprintf("warning: unsent data(2) acknowledged transid %08llx\n", + (long long)transid); transid = 0; } jo->flags &= ~MC_JOURNAL_RACTIVE; diff --git a/sys/kern/vfs_rangelock.c b/sys/kern/vfs_rangelock.c index 87d4212898..06d452d438 100644 --- a/sys/kern/vfs_rangelock.c +++ b/sys/kern/vfs_rangelock.c @@ -139,14 +139,14 @@ vrange_lock_overlapped(struct vnode *vp, if (tsleep(&vp->v_range.vh_list, 0, "vrnglk", hz * 3) == EWOULDBLOCK) { if (warned == 0) kprintf("warning: conflicted lock vp %p %lld,%lld blocked\n", - vp, vr->vr_offset, vr->vr_length); + vp, (long long)vr->vr_offset, (long long)vr->vr_length); warned = 1; } conflicted = vrange_lock_conflicted(vp, vr); } if (warned) { kprintf("waring: conflicted lock vp %p %lld,%lld unblocked\n", - vp, vr->vr_offset, vr->vr_length); + vp, (long long)vr->vr_offset, (long long)vr->vr_length); } } diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index de1c93a7fe..18d9821264 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1912,7 +1912,7 @@ vfs_msync(struct mount *mp, int flags) if (flags != MNT_WAIT) vmsc_flags |= VMSC_NOWAIT; vmntvnodescan(mp, vmsc_flags, vfs_msync_scan1, vfs_msync_scan2, - (void *)flags); + (void *)(intptr_t)flags); } /* @@ -1924,7 +1924,7 @@ static int vfs_msync_scan1(struct mount *mp, struct vnode *vp, void *data) { - int flags = (int)data; + int flags = (int)(intptr_t)data; if ((vp->v_flag & VRECLAIMED) == 0) { if (vshouldmsync(vp)) @@ -1950,7 +1950,7 @@ int vfs_msync_scan2(struct mount *mp, struct vnode *vp, void *data) { vm_object_t obj; - int flags = (int)data; + int flags = (int)(intptr_t)data; if (vp->v_flag & VRECLAIMED) return(0); @@ -2103,12 +2103,13 @@ vn_isdisk(struct vnode *vp, int *errp) int vn_get_namelen(struct vnode *vp, int *namelen) { - int error, retval[2]; + int error; + register_t retval[2]; error = VOP_PATHCONF(vp, _PC_NAME_MAX, retval); if (error) return (error); - *namelen = *retval; + *namelen = (int)retval[0]; return (0); } diff --git a/sys/libiconv/iconv.c b/sys/libiconv/iconv.c index 68852e2d4e..d733590166 100644 --- a/sys/libiconv/iconv.c +++ b/sys/libiconv/iconv.c @@ -433,7 +433,8 @@ char * iconv_convstr(void *handle, char *dst, const char *src) { char *p = dst; - int inlen, outlen, error; + int error; + size_t inlen, outlen; if (handle == NULL) { strcpy(dst, src); @@ -455,7 +456,8 @@ iconv_convmem(void *handle, void *dst, const void *src, int size) { const char *s = src; char *d = dst; - int inlen, outlen, error; + size_t inlen, outlen; + int error; if (size == 0) return dst; diff --git a/sys/net/ip6fw/ip6_fw.c b/sys/net/ip6fw/ip6_fw.c index ca8b94ee4f..b2ad5c8549 100644 --- a/sys/net/ip6fw/ip6_fw.c +++ b/sys/net/ip6fw/ip6_fw.c @@ -967,8 +967,8 @@ check_ip6fw_mbuf(struct mbuf *m) { /* Check length */ if (m->m_len != sizeof(struct ip6_fw)) { - dprintf(("%s len=%d, want %d\n", err_prefix, m->m_len, - sizeof(struct ip6_fw))); + dprintf(("%s len=%d, want %ld\n", err_prefix, m->m_len, + sizeof(struct ip6_fw))); return (NULL); } return(check_ip6fw_struct(mtod(m, struct ip6_fw *))); @@ -1184,8 +1184,8 @@ ip6_fw_ctl(int stage, struct mbuf **mm) } if (stage == IPV6_FW_DEL) { if (m->m_len != sizeof(struct ip6_fw)) { - dprintf(("%s len=%d, want %d\n", err_prefix, m->m_len, - sizeof(struct ip6_fw))); + dprintf(("%s len=%d, want %ld\n", err_prefix, m->m_len, + sizeof(struct ip6_fw))); error = EINVAL; } else if (mtod(m, struct ip6_fw *)->fw_number == (u_short)-1) { dprintf(("%s can't delete rule 65535\n", err_prefix)); diff --git a/sys/net/ipfw/ip_fw2.c b/sys/net/ipfw/ip_fw2.c index afbc59be3e..c2c7528bcf 100644 --- a/sys/net/ipfw/ip_fw2.c +++ b/sys/net/ipfw/ip_fw2.c @@ -2945,7 +2945,7 @@ ipfw_flush(int kill_default) KASSERT(static_count == 1, ("%u static rules remains\n", static_count)); KASSERT(static_ioc_len == IOC_RULESIZE(ctx->ipfw_default_rule), - ("%u bytes of static rules remains, should be %u\n", + ("%u bytes of static rules remains, should be %lu\n", static_ioc_len, IOC_RULESIZE(ctx->ipfw_default_rule))); } diff --git a/sys/net/netisr.c b/sys/net/netisr.c index b4c9547e11..f8a2f6e587 100644 --- a/sys/net/netisr.c +++ b/sys/net/netisr.c @@ -479,7 +479,7 @@ sync_soport(struct socket *so __unused, struct sockaddr *nam __unused, static void schednetisr_remote(void *data) { - int num = (int)data; + int num = (int)(intptr_t)data; struct netisr *ni = &netisrs[num]; lwkt_port_t port = &netisr_cpu[0].td_msgport; struct netmsg *pmsg; @@ -504,9 +504,9 @@ schednetisr(int num) if (mycpu->gd_cpuid != 0) lwkt_send_ipiq(globaldata_find(0), schednetisr_remote, (void *)num); else - schednetisr_remote((void *)num); + schednetisr_remote((void *)(intptr_t)num); #else - schednetisr_remote((void *)num); + schednetisr_remote((void *)(intptr_t)num); #endif } diff --git a/sys/netgraph/netgraph/ng_parse.c b/sys/netgraph/netgraph/ng_parse.c index 3c996a683b..4869b837b3 100644 --- a/sys/netgraph/netgraph/ng_parse.c +++ b/sys/netgraph/netgraph/ng_parse.c @@ -356,7 +356,7 @@ ng_int8_unparse(const struct ng_parse_type *type, int8_t val; bcopy(data + *off, &val, sizeof(int8_t)); - switch ((int)type->info) { + switch ((int)(intptr_t)type->info) { case INT_SIGNED: fmt = "%d"; fval = val; @@ -450,7 +450,7 @@ ng_int16_unparse(const struct ng_parse_type *type, int16_t val; bcopy(data + *off, &val, sizeof(int16_t)); - switch ((int)type->info) { + switch ((int)(intptr_t)type->info) { case INT_SIGNED: fmt = "%d"; fval = val; @@ -544,7 +544,7 @@ ng_int32_unparse(const struct ng_parse_type *type, int32_t val; bcopy(data + *off, &val, sizeof(int32_t)); - switch ((int)type->info) { + switch ((int)(intptr_t)type->info) { case INT_SIGNED: fmt = "%ld"; fval = val; @@ -637,7 +637,7 @@ ng_int64_unparse(const struct ng_parse_type *type, int64_t val; bcopy(data + *off, &val, sizeof(int64_t)); - switch ((int)type->info) { + switch ((int)(intptr_t)type->info) { case INT_SIGNED: fmt = "%lld"; fval = val; diff --git a/sys/netgraph/tty/ng_tty.c b/sys/netgraph/tty/ng_tty.c index 6a7666c4be..6da34b57d4 100644 --- a/sys/netgraph/tty/ng_tty.c +++ b/sys/netgraph/tty/ng_tty.c @@ -317,7 +317,7 @@ ngt_tioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct ucred *cre if (node->name) strncpy(ni->name, node->name, sizeof(ni->name) - 1); strncpy(ni->type, node->type->name, sizeof(ni->type) - 1); - ni->id = (u_int32_t) node; + ni->id = (u_int32_t)(uintptr_t)node; ni->hooks = node->numhooks; break; } diff --git a/sys/netproto/smb/smb_subr.c b/sys/netproto/smb/smb_subr.c index 8e546a668d..bdf041ffd2 100644 --- a/sys/netproto/smb/smb_subr.c +++ b/sys/netproto/smb/smb_subr.c @@ -307,9 +307,9 @@ smb_maperror(int eclass, int eno) } static int -smb_copy_iconv(struct mbchain *mbp, c_caddr_t src, caddr_t dst, int len) +smb_copy_iconv(struct mbchain *mbp, c_caddr_t src, caddr_t dst, size_t len) { - int outlen = len; + size_t outlen = len; return iconv_conv((struct iconv_drv*)mbp->mb_udata, &src, &len, &dst, &outlen); } @@ -395,7 +395,8 @@ kthread_create2(void (*func)(void *), void *arg, __va_end(ap); /* call the processes' main()... */ - cpu_set_fork_handler(lp2, (void (*)(void *))func, arg); + cpu_set_fork_handler(lp2, + (void (*)(void *, struct trapframe *))func, arg); start_forked_proc(&lwp0, p2); return 0; diff --git a/sys/platform/pc64/amd64/db_trace.c b/sys/platform/pc64/amd64/db_trace.c index bf02be1dab..01652962dd 100644 --- a/sys/platform/pc64/amd64/db_trace.c +++ b/sys/platform/pc64/amd64/db_trace.c @@ -205,7 +205,7 @@ db_print_stack_entry(const char *name, int narg, char **argnp, long *argp, while (narg) { if (argnp) db_printf("%s=", *argnp++); - db_printf("%r", db_get_value((long)argp, 8, FALSE)); + db_printf("%ld", (long)db_get_value((long)argp, 8, FALSE)); argp++; if (--narg != 0) db_printf(","); @@ -277,7 +277,7 @@ db_nextframe(struct amd64_frame **fp, db_addr_t *ip) rip = tf->tf_rip; rbp = tf->tf_rbp; db_printf( - "--- trap %#r, rip = %#r, rsp = %#r, rbp = %#r ---\n", + "--- trap %016lx, rip = %016lx, rsp = %016lx, rbp = %016lx ---\n", tf->tf_trapno, rip, rsp, rbp); } break; @@ -286,7 +286,7 @@ db_nextframe(struct amd64_frame **fp, db_addr_t *ip) rip = tf->tf_rip; rbp = tf->tf_rbp; db_printf( - "--- syscall %#r, rip = %#r, rsp = %#r, rbp = %#r ---\n", + "--- syscall %016lx, rip = %016lx, rsp = %016lx, rbp = %016lx ---\n", tf->tf_rax, rip, rsp, rbp); } break; @@ -296,7 +296,7 @@ db_nextframe(struct amd64_frame **fp, db_addr_t *ip) rip = tf->tf_rip; rbp = tf->tf_rbp; db_printf( - "--- interrupt, rip = %#r, rsp = %#r, rbp = %#r ---\n", + "--- interrupt, rip = %016lx, rsp = %016lx, rbp = %016lx ---\n", rip, rsp, rbp); } break; @@ -313,7 +313,7 @@ db_stack_trace_cmd(db_expr_t addr, boolean_t have_addr, db_expr_t count, char *modif) { struct amd64_frame *frame; - int *argp; + long *argp; db_addr_t callpc; boolean_t first; int i; @@ -635,7 +635,7 @@ db_md_list_watchpoints(void) unsigned type, len; type = (d.dr[7] >> (16 + (i * 4))) & 3; len = (d.dr[7] >> (16 + (i * 4) + 2)) & 3; - db_printf(" %-5d %-8s %10s %3d 0x%08x\n", + db_printf(" %-5d %-8s %10s %3d 0x%08lx\n", i, "enabled", watchtype_str(type), len + 1, DBREG_DRX((&d), i)); } else { @@ -645,7 +645,7 @@ db_md_list_watchpoints(void) db_printf("\ndebug register values:\n"); for (i = 0; i < 8; i++) - db_printf(" dr%d 0x%08x\n", i, DBREG_DRX((&d),i)); + db_printf(" dr%d 0x%08lx\n", i, DBREG_DRX((&d),i)); db_printf("\n"); } diff --git a/sys/platform/pc64/amd64/init.c b/sys/platform/pc64/amd64/init.c index 89d78daefd..952e8aa13e 100644 --- a/sys/platform/pc64/amd64/init.c +++ b/sys/platform/pc64/amd64/init.c @@ -68,15 +68,11 @@ struct privatespace CPU_prvspace[]; #endif -extern vm_paddr_t phys_avail[16]; -extern vm_paddr_t Maxmem; vm_paddr_t Maxmem_bytes; int MemImageFd = -1; int DiskNum; int NetifNum; char *pid_file; -extern struct msgbuf *msgbufp; -extern caddr_t ptvmmap; #if JG u_int tsc_present; vm_offset_t KvaStart; @@ -84,11 +80,7 @@ vm_offset_t KvaEnd; vm_offset_t KvaSize; vm_offset_t virtual_start; #endif -extern vm_offset_t virtual_end; -extern vm_offset_t kernel_vm_end; vm_offset_t crashdumpmap; -extern vm_offset_t clean_sva; -extern vm_offset_t clean_eva; static void init_sys_memory(char *imageFile); static void init_kern_memory(void); diff --git a/sys/platform/pc64/amd64/nexus.c b/sys/platform/pc64/amd64/nexus.c index 1f92707ea8..80f15002d7 100644 --- a/sys/platform/pc64/amd64/nexus.c +++ b/sys/platform/pc64/amd64/nexus.c @@ -562,7 +562,7 @@ nexus_delete_resource(device_t dev, device_t child, int type, int rid) * Temporary Debugging */ -static void PCHAR_(int); +static void PCHAR_(int, void * __unused); int kprintf0(const char *fmt, ...) @@ -578,7 +578,7 @@ kprintf0(const char *fmt, ...) } static void -PCHAR_(int c) +PCHAR_(int c, void *dummy __unused) { const int COMC_TXWAIT = 0x40000; const int COMPORT = 0x3f8; diff --git a/sys/platform/pc64/amd64/trap.c b/sys/platform/pc64/amd64/trap.c index 08be0d597f..960fe69398 100644 --- a/sys/platform/pc64/amd64/trap.c +++ b/sys/platform/pc64/amd64/trap.c @@ -80,6 +80,7 @@ #include #include +#include #ifdef SMP @@ -96,7 +97,6 @@ #endif extern void trap(struct trapframe *frame); -extern void syscall2(struct trapframe *frame); static int trap_pfault(struct trapframe *, int); static void trap_fatal(struct trapframe *, vm_offset_t); @@ -276,7 +276,7 @@ static __inline void userexit(struct lwp *lp) { struct thread *td = lp->lwp_thread; - globaldata_t gd = td->td_gd; +/* globaldata_t gd = td->td_gd;*/ /* * Handle stop requests at kernel priority. Any requests queued @@ -485,7 +485,7 @@ trap(struct trapframe *frame) MAKEMPSAFE(have_mplock); i = trap_pfault(frame, TRUE); if (frame->tf_rip == 0) - kprintf("T_PAGEFLT: Warning %rip == 0!\n"); + kprintf("T_PAGEFLT: Warning %%rip == 0!\n"); if (i == -1) goto out; if (i == 0) @@ -878,7 +878,7 @@ nogo: * kludge is needed to pass the fault address to signal handlers. */ kprintf("seg-fault accessing address %p ip=%p\n", - va, frame->tf_rip); + (void *)va, (void *)frame->tf_rip); /* Debugger("seg-fault"); */ return((rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV); diff --git a/sys/platform/pc64/amd64/vm_machdep.c b/sys/platform/pc64/amd64/vm_machdep.c index c9b4d16e8d..32f99f06a9 100644 --- a/sys/platform/pc64/amd64/vm_machdep.c +++ b/sys/platform/pc64/amd64/vm_machdep.c @@ -196,7 +196,26 @@ cpu_fork(struct lwp *lp1, struct lwp *lp2, int flags) int cpu_prepare_lwp(struct lwp *lp, struct lwp_params *params) { - panic("dummy called in vm_machdep.c: line: %d", __LINE__); + struct trapframe *regs = lp->lwp_md.md_regs; + void *bad_return = NULL; + int error; + + regs->tf_rip = (long)params->func; + regs->tf_rsp = (long)params->stack; + /* Set up argument for function call */ + regs->tf_rdi = (long)params->arg; + /* + * Set up fake return address. As the lwp function may never return, + * we simply copy out a NULL pointer and force the lwp to receive + * a SIGSEGV if it returns anyways. + */ + regs->tf_rsp -= sizeof(void *); + error = copyout(&bad_return, (void *)regs->tf_rsp, sizeof(bad_return)); + if (error) + return (error); + + cpu_set_fork_handler(lp, + (void (*)(void *, struct trapframe *))generic_lwp_return, lp); return (0); } diff --git a/sys/platform/pc64/isa/clock.c b/sys/platform/pc64/isa/clock.c index 7bdc3860a6..bd8410f4e9 100644 --- a/sys/platform/pc64/isa/clock.c +++ b/sys/platform/pc64/isa/clock.c @@ -612,7 +612,7 @@ calibrate_clocks(void) } if (tsc_present) - kprintf("TSC clock: %llu Hz, ", tsc_frequency); + kprintf("TSC clock: %llu Hz, ", (long long)tsc_frequency); kprintf("i8254 clock: %u Hz\n", tot_count); return (tot_count); diff --git a/sys/sys/mchain.h b/sys/sys/mchain.h index 0456259721..f880aac950 100644 --- a/sys/sys/mchain.h +++ b/sys/sys/mchain.h @@ -101,7 +101,7 @@ struct mbuf; struct mbchain; struct uio; -typedef int mb_copy_t(struct mbchain *mbp, c_caddr_t src, caddr_t dst, int len); +typedef int mb_copy_t(struct mbchain *mbp, c_caddr_t src, caddr_t dst, size_t len); struct mbchain { struct mbuf * mb_top; /* head of mbufs chain */ diff --git a/sys/vfs/hammer/hammer_blockmap.c b/sys/vfs/hammer/hammer_blockmap.c index afac580d64..62083356be 100644 --- a/sys/vfs/hammer/hammer_blockmap.c +++ b/sys/vfs/hammer/hammer_blockmap.c @@ -1077,7 +1077,7 @@ failed: hammer_rel_volume(root_volume, 0); if (hammer_debug_general & 0x0800) { kprintf("hammer_blockmap_getfree: %016llx -> %d\n", - zone_offset, bytes); + (long long)zone_offset, bytes); } return(bytes); } @@ -1177,7 +1177,7 @@ failed: hammer_rel_volume(root_volume, 0); if (hammer_debug_general & 0x0800) { kprintf("hammer_blockmap_lookup: %016llx -> %016llx\n", - zone_offset, result_offset); + (long long)zone_offset, (long long)result_offset); } return(result_offset); } diff --git a/sys/vfs/hammer/hammer_btree.c b/sys/vfs/hammer/hammer_btree.c index f3fe3ad45c..9305e1991c 100644 --- a/sys/vfs/hammer/hammer_btree.c +++ b/sys/vfs/hammer/hammer_btree.c @@ -155,9 +155,9 @@ hammer_btree_iterate(hammer_cursor_t cursor) if (cursor->index == node->count) { if (hammer_debug_btree) { kprintf("BRACKETU %016llx[%d] -> %016llx[%d] (td=%p)\n", - cursor->node->node_offset, + (long long)cursor->node->node_offset, cursor->index, - (cursor->parent ? cursor->parent->node_offset : -1), + (long long)(cursor->parent ? cursor->parent->node_offset : -1), cursor->parent_index, curthread); } @@ -197,21 +197,21 @@ hammer_btree_iterate(hammer_cursor_t cursor) s = hammer_btree_cmp(&cursor->key_beg, &elm[1].base); if (hammer_debug_btree) { kprintf("BRACKETL %016llx[%d] %016llx %02x %016llx lo=%02x %d (td=%p)\n", - cursor->node->node_offset, + (long long)cursor->node->node_offset, cursor->index, - elm[0].internal.base.obj_id, + (long long)elm[0].internal.base.obj_id, elm[0].internal.base.rec_type, - elm[0].internal.base.key, + (long long)elm[0].internal.base.key, elm[0].internal.base.localization, r, curthread ); kprintf("BRACKETR %016llx[%d] %016llx %02x %016llx lo=%02x %d\n", - cursor->node->node_offset, + (long long)cursor->node->node_offset, cursor->index + 1, - elm[1].internal.base.obj_id, + (long long)elm[1].internal.base.obj_id, elm[1].internal.base.rec_type, - elm[1].internal.base.key, + (long long)elm[1].internal.base.key, elm[1].internal.base.localization, s ); @@ -259,13 +259,13 @@ hammer_btree_iterate(hammer_cursor_t cursor) r = hammer_btree_cmp(&cursor->key_end, &elm->base); if (hammer_debug_btree) { kprintf("ELEMENT %016llx:%d %c %016llx %02x %016llx lo=%02x %d\n", - cursor->node->node_offset, + (long long)cursor->node->node_offset, cursor->index, (elm[0].leaf.base.btype ? elm[0].leaf.base.btype : '?'), - elm[0].leaf.base.obj_id, + (long long)elm[0].leaf.base.obj_id, elm[0].leaf.base.rec_type, - elm[0].leaf.base.key, + (long long)elm[0].leaf.base.key, elm[0].leaf.base.localization, r ); @@ -313,9 +313,9 @@ hammer_btree_iterate(hammer_cursor_t cursor) hammer_btree_elm_t elm = &cursor->node->ondisk->elms[i]; kprintf("ITERATE %p:%d %016llx %02x %016llx lo=%02x\n", cursor->node, i, - elm->internal.base.obj_id, + (long long)elm->internal.base.obj_id, elm->internal.base.rec_type, - elm->internal.base.key, + (long long)elm->internal.base.key, elm->internal.base.localization ); } @@ -437,20 +437,20 @@ hammer_btree_iterate_reverse(hammer_cursor_t cursor) s = hammer_btree_cmp(&cursor->key_beg, &elm[1].base); if (hammer_debug_btree) { kprintf("BRACKETL %016llx[%d] %016llx %02x %016llx lo=%02x %d\n", - cursor->node->node_offset, + (long long)cursor->node->node_offset, cursor->index, - elm[0].internal.base.obj_id, + (long long)elm[0].internal.base.obj_id, elm[0].internal.base.rec_type, - elm[0].internal.base.key, + (long long)elm[0].internal.base.key, elm[0].internal.base.localization, r ); kprintf("BRACKETR %016llx[%d] %016llx %02x %016llx lo=%02x %d\n", - cursor->node->node_offset, + (long long)cursor->node->node_offset, cursor->index + 1, - elm[1].internal.base.obj_id, + (long long)elm[1].internal.base.obj_id, elm[1].internal.base.rec_type, - elm[1].internal.base.key, + (long long)elm[1].internal.base.key, elm[1].internal.base.localization, s ); @@ -482,13 +482,13 @@ hammer_btree_iterate_reverse(hammer_cursor_t cursor) s = hammer_btree_cmp(&cursor->key_beg, &elm->base); if (hammer_debug_btree) { kprintf("ELEMENT %016llx:%d %c %016llx %02x %016llx lo=%02x %d\n", - cursor->node->node_offset, + (long long)cursor->node->node_offset, cursor->index, (elm[0].leaf.base.btype ? elm[0].leaf.base.btype : '?'), - elm[0].leaf.base.obj_id, + (long long)elm[0].leaf.base.obj_id, elm[0].leaf.base.rec_type, - elm[0].leaf.base.key, + (long long)elm[0].leaf.base.key, elm[0].leaf.base.localization, s ); @@ -526,9 +526,9 @@ hammer_btree_iterate_reverse(hammer_cursor_t cursor) hammer_btree_elm_t elm = &cursor->node->ondisk->elms[i]; kprintf("ITERATE %p:%d %016llx %02x %016llx lo=%02x\n", cursor->node, i, - elm->internal.base.obj_id, + (long long)elm->internal.base.obj_id, elm->internal.base.rec_type, - elm->internal.base.key, + (long long)elm->internal.base.key, elm->internal.base.localization ); } @@ -597,7 +597,7 @@ hammer_btree_lookup(hammer_cursor_t cursor) } if (hammer_debug_btree) { kprintf("CREATE_CHECK %016llx\n", - cursor->create_check); + (long long)cursor->create_check); } cursor->key_beg.create_tid = cursor->create_check; /* loop */ @@ -717,7 +717,7 @@ hammer_btree_extract(hammer_cursor_t cursor, int flags) &error, &cursor->data_buffer); if (hammer_crc_test_leaf(cursor->data, &elm->leaf) == 0) { kprintf("CRC DATA @ %016llx/%d FAILED\n", - elm->leaf.data_offset, elm->leaf.data_len); + (long long)elm->leaf.data_offset, elm->leaf.data_len); if (hammer_debug_debug & 0x0001) Debugger("CRC FAILED: DATA"); if (cursor->trans->flags & HAMMER_TRANSF_CRCDOM) @@ -946,22 +946,23 @@ btree_search(hammer_cursor_t cursor, int flags) if (hammer_debug_btree) { kprintf("SEARCH %016llx[%d] %016llx %02x key=%016llx cre=%016llx lo=%02x (td = %p)\n", - cursor->node->node_offset, + (long long)cursor->node->node_offset, cursor->index, - cursor->key_beg.obj_id, + (long long)cursor->key_beg.obj_id, cursor->key_beg.rec_type, - cursor->key_beg.key, - cursor->key_beg.create_tid, + (long long)cursor->key_beg.key, + (long long)cursor->key_beg.create_tid, cursor->key_beg.localization, curthread ); if (cursor->parent) kprintf("SEARCHP %016llx[%d] (%016llx/%016llx %016llx/%016llx) (%p/%p %p/%p)\n", - cursor->parent->node_offset, cursor->parent_index, - cursor->left_bound->obj_id, - cursor->parent->ondisk->elms[cursor->parent_index].internal.base.obj_id, - cursor->right_bound->obj_id, - cursor->parent->ondisk->elms[cursor->parent_index+1].internal.base.obj_id, + (long long)cursor->parent->node_offset, + cursor->parent_index, + (long long)cursor->left_bound->obj_id, + (long long)cursor->parent->ondisk->elms[cursor->parent_index].internal.base.obj_id, + (long long)cursor->right_bound->obj_id, + (long long)cursor->parent->ondisk->elms[cursor->parent_index+1].internal.base.obj_id, cursor->left_bound, &cursor->parent->ondisk->elms[cursor->parent_index], cursor->right_bound, @@ -1054,7 +1055,7 @@ btree_search(hammer_cursor_t cursor, int flags) ++hammer_stats_btree_iterations; if (hammer_debug_btree) { kprintf("SEARCH-I %016llx count=%d\n", - cursor->node->node_offset, + (long long)cursor->node->node_offset, node->count); } @@ -1182,12 +1183,12 @@ btree_search(hammer_cursor_t cursor, int flags) if (hammer_debug_btree) { kprintf("RESULT-I %016llx[%d] %016llx %02x " "key=%016llx cre=%016llx lo=%02x\n", - cursor->node->node_offset, + (long long)cursor->node->node_offset, i, - elm->internal.base.obj_id, + (long long)elm->internal.base.obj_id, elm->internal.base.rec_type, - elm->internal.base.key, - elm->internal.base.create_tid, + (long long)elm->internal.base.key, + (long long)elm->internal.base.create_tid, elm->internal.base.localization ); } @@ -1259,7 +1260,7 @@ btree_search(hammer_cursor_t cursor, int flags) KKASSERT(node->count <= HAMMER_BTREE_LEAF_ELMS); if (hammer_debug_btree) { kprintf("SEARCH-L %016llx count=%d\n", - cursor->node->node_offset, + (long long)cursor->node->node_offset, node->count); } @@ -1313,7 +1314,7 @@ btree_search(hammer_cursor_t cursor, int flags) error = 0; if (hammer_debug_btree) { kprintf("RESULT-L %016llx[%d] (SUCCESS)\n", - cursor->node->node_offset, i); + (long long)cursor->node->node_offset, i); } goto done; } @@ -1324,7 +1325,7 @@ btree_search(hammer_cursor_t cursor, int flags) failed: if (hammer_debug_btree) { kprintf("RESULT-L %016llx[%d] (FAILED)\n", - cursor->node->node_offset, i); + (long long)cursor->node->node_offset, i); } /* @@ -2366,7 +2367,9 @@ hammer_btree_mirror_propagate(hammer_cursor_t cursor, hammer_tid_t mirror_tid) if (hammer_debug_general & 0x0002) { kprintf("mirror_propagate: propagate " "%016llx @%016llx:%d\n", - mirror_tid, node->node_offset, cursor->index); + (long long)mirror_tid, + (long long)node->node_offset, + cursor->index); } @@ -2381,7 +2384,8 @@ hammer_btree_mirror_propagate(hammer_cursor_t cursor, hammer_tid_t mirror_tid) if (hammer_debug_general & 0x0002) { kprintf("mirror_propagate: propagate " "%016llx @%016llx\n", - mirror_tid, node->node_offset); + (long long)mirror_tid, + (long long)node->node_offset); } } if (error == ENOENT) @@ -2832,7 +2836,8 @@ hammer_print_btree_node(hammer_node_ondisk_t ondisk) int i; kprintf("node %p count=%d parent=%016llx type=%c\n", - ondisk, ondisk->count, ondisk->parent, ondisk->type); + ondisk, ondisk->count, + (long long)ondisk->parent, ondisk->type); /* * Dump both boundary elements if an internal node @@ -2854,10 +2859,10 @@ void hammer_print_btree_elm(hammer_btree_elm_t elm, u_int8_t type, int i) { kprintf(" %2d", i); - kprintf("\tobj_id = %016llx\n", elm->base.obj_id); - kprintf("\tkey = %016llx\n", elm->base.key); - kprintf("\tcreate_tid = %016llx\n", elm->base.create_tid); - kprintf("\tdelete_tid = %016llx\n", elm->base.delete_tid); + kprintf("\tobj_id = %016llx\n", (long long)elm->base.obj_id); + kprintf("\tkey = %016llx\n", (long long)elm->base.key); + kprintf("\tcreate_tid = %016llx\n", (long long)elm->base.create_tid); + kprintf("\tdelete_tid = %016llx\n", (long long)elm->base.delete_tid); kprintf("\trec_type = %04x\n", elm->base.rec_type); kprintf("\tobj_type = %02x\n", elm->base.obj_type); kprintf("\tbtype = %02x (%c)\n", @@ -2868,10 +2873,11 @@ hammer_print_btree_elm(hammer_btree_elm_t elm, u_int8_t type, int i) switch(type) { case HAMMER_BTREE_TYPE_INTERNAL: kprintf("\tsubtree_off = %016llx\n", - elm->internal.subtree_offset); + (long long)elm->internal.subtree_offset); break; case HAMMER_BTREE_TYPE_RECORD: - kprintf("\tdata_offset = %016llx\n", elm->leaf.data_offset); + kprintf("\tdata_offset = %016llx\n", + (long long)elm->leaf.data_offset); kprintf("\tdata_len = %08x\n", elm->leaf.data_len); kprintf("\tdata_crc = %08x\n", elm->leaf.data_crc); break; diff --git a/sys/vfs/hammer/hammer_cursor.c b/sys/vfs/hammer/hammer_cursor.c index 02b5ef68cc..027a323c8a 100644 --- a/sys/vfs/hammer/hammer_cursor.c +++ b/sys/vfs/hammer/hammer_cursor.c @@ -461,7 +461,7 @@ hammer_cursor_down(hammer_cursor_t cursor) if (error == 0) { KASSERT(elm->base.btype == node->ondisk->type, ("BTYPE MISMATCH %c %c NODE %p\n", elm->base.btype, node->ondisk->type, node)); if (node->ondisk->parent != cursor->parent->node_offset) - panic("node %p %016llx vs %016llx\n", node, node->ondisk->parent, cursor->parent->node_offset); + panic("node %p %016llx vs %016llx\n", node, (long long)node->ondisk->parent, (long long)cursor->parent->node_offset); KKASSERT(node->ondisk->parent == cursor->parent->node_offset); } break; diff --git a/sys/vfs/hammer/hammer_inode.c b/sys/vfs/hammer/hammer_inode.c index 27e6bc792c..bdd30b18cc 100644 --- a/sys/vfs/hammer/hammer_inode.c +++ b/sys/vfs/hammer/hammer_inode.c @@ -837,7 +837,8 @@ hammer_create_inode(hammer_transaction_t trans, struct vattr *vap, hammer_free_inode(ip); ip = NULL; } else if (RB_INSERT(hammer_ino_rb_tree, &hmp->rb_inos_root, ip)) { - panic("hammer_create_inode: duplicate obj_id %llx", ip->obj_id); + panic("hammer_create_inode: duplicate obj_id %llx", + (long long)ip->obj_id); /* not reached */ hammer_free_inode(ip); } diff --git a/sys/vfs/hammer/hammer_io.c b/sys/vfs/hammer/hammer_io.c index bcd6223b78..8b40c76a6f 100644 --- a/sys/vfs/hammer/hammer_io.c +++ b/sys/vfs/hammer/hammer_io.c @@ -1113,7 +1113,7 @@ hammer_io_direct_read(hammer_mount_t hmp, struct bio *bio, done: if (error) { kprintf("hammer_direct_read: failed @ %016llx\n", - zone2_offset); + (long long)zone2_offset); bp->b_error = error; bp->b_flags |= B_ERROR; biodone(bio); @@ -1256,7 +1256,7 @@ hammer_io_direct_write(hammer_mount_t hmp, hammer_record_t record, * to the tree so we do not have to worry about the backend. */ kprintf("hammer_direct_write: failed @ %016llx\n", - leaf->data_offset); + (long long)leaf->data_offset); bp = bio->bio_buf; bp->b_resid = 0; bp->b_error = EIO; diff --git a/sys/vfs/hammer/hammer_object.c b/sys/vfs/hammer/hammer_object.c index 5068cda545..74fe30b0e0 100644 --- a/sys/vfs/hammer/hammer_object.c +++ b/sys/vfs/hammer/hammer_object.c @@ -1180,7 +1180,7 @@ hammer_ip_sync_record_cursor(hammer_cursor_t cursor, hammer_record_t record) kprintf("DOINSERT LOOKUP %d\n", error); if (error == 0) { kprintf("hammer_ip_sync_record: duplicate rec " - "at (%016llx)\n", record->leaf.base.key); + "at (%016llx)\n", (long long)record->leaf.base.key); Debugger("duplicate record1"); error = EIO; } @@ -1236,8 +1236,13 @@ hammer_ip_sync_record_cursor(hammer_cursor_t cursor, hammer_record_t record) } error = hammer_btree_insert(cursor, &record->leaf, &doprop); - if (hammer_debug_inode && error) - kprintf("BTREE INSERT error %d @ %016llx:%d key %016llx\n", error, cursor->node->node_offset, cursor->index, record->leaf.base.key); + if (hammer_debug_inode && error) { + kprintf("BTREE INSERT error %d @ %016llx:%d key %016llx\n", + error, + (long long)cursor->node->node_offset, + cursor->index, + (long long)record->leaf.base.key); + } /* * Our record is on-disk and we normally mark the in-memory version @@ -1390,8 +1395,12 @@ _hammer_ip_seek_btree(hammer_cursor_t cursor) if (ip->flags & (HAMMER_INODE_ONDISK|HAMMER_INODE_DONDISK)) { error = hammer_btree_lookup(cursor); if (error == ENOENT || error == EDEADLK) { - if (hammer_debug_general & 0x2000) - kprintf("error %d node %p %016llx index %d\n", error, cursor->node, cursor->node->node_offset, cursor->index); + if (hammer_debug_general & 0x2000) { + kprintf("error %d node %p %016llx index %d\n", + error, cursor->node, + (long long)cursor->node->node_offset, + cursor->index); + } cursor->flags &= ~HAMMER_CURSOR_ATEDISK; error = hammer_btree_iterate(cursor); } @@ -1929,7 +1938,8 @@ retry: */ if (off < ran_beg && leaf->base.key > ran_beg) { panic("hammer left edge case %016llx %d\n", - leaf->base.key, leaf->data_len); + (long long)leaf->base.key, + leaf->data_len); } /* @@ -2242,8 +2252,8 @@ hammer_delete_at_cursor(hammer_cursor_t cursor, int delete_flags, if (hammer_debug_general & 0x0002) { kprintf("delete_at_cursor: propagate %016llx" " @%016llx\n", - elm->leaf.base.delete_tid, - node->node_offset); + (long long)elm->leaf.base.delete_tid, + (long long)node->node_offset); } } diff --git a/sys/vfs/hammer/hammer_ondisk.c b/sys/vfs/hammer/hammer_ondisk.c index ff24acfc65..02c16f21b8 100644 --- a/sys/vfs/hammer/hammer_ondisk.c +++ b/sys/vfs/hammer/hammer_ondisk.c @@ -756,8 +756,13 @@ hammer_del_buffers(hammer_mount_t hmp, hammer_off_t base_offset, } if (error) { ret_error = error; - if (report_conflicts || (hammer_debug_general & 0x8000)) - kprintf("hammer_del_buffers: unable to invalidate %016llx buffer=%p rep=%d\n", base_offset, buffer, report_conflicts); + if (report_conflicts || + (hammer_debug_general & 0x8000)) { + kprintf("hammer_del_buffers: unable to " + "invalidate %016llx buffer=%p rep=%d\n", + (long long)base_offset, + buffer, report_conflicts); + } } base_offset += HAMMER_BUFSIZE; zone2_offset += HAMMER_BUFSIZE; @@ -782,8 +787,9 @@ hammer_load_buffer(hammer_buffer_t buffer, int isnew) if (hammer_debug_io & 0x0001) { kprintf("load_buffer %016llx %016llx isnew=%d od=%p\n", - buffer->zoneX_offset, buffer->zone2_offset, isnew, - buffer->ondisk); + (long long)buffer->zoneX_offset, + (long long)buffer->zone2_offset, + isnew, buffer->ondisk); } if (buffer->ondisk == NULL) { diff --git a/sys/vfs/hammer/hammer_prune.c b/sys/vfs/hammer/hammer_prune.c index 63da51ba3f..d266a85649 100644 --- a/sys/vfs/hammer/hammer_prune.c +++ b/sys/vfs/hammer/hammer_prune.c @@ -155,16 +155,17 @@ retry: if (hammer_debug_general & 0x0200) { kprintf("check %016llx %016llx cre=%016llx del=%016llx\n", - elm->base.obj_id, - elm->base.key, - elm->base.create_tid, - elm->base.delete_tid); + (long long)elm->base.obj_id, + (long long)elm->base.key, + (long long)elm->base.create_tid, + (long long)elm->base.delete_tid); } if (prune_should_delete(prune, elm)) { if (hammer_debug_general & 0x0200) { kprintf("check %016llx %016llx: DELETE\n", - elm->base.obj_id, elm->base.key); + (long long)elm->base.obj_id, + (long long)elm->base.key); } /* @@ -209,7 +210,8 @@ retry: cursor.flags |= HAMMER_CURSOR_ATEDISK; if (hammer_debug_general & 0x0100) { kprintf("check %016llx %016llx: SKIP\n", - elm->base.obj_id, elm->base.key); + (long long)elm->base.obj_id, + (long long)elm->base.key); } } ++prune->stat_scanrecords; @@ -316,13 +318,13 @@ prune_check_nlinks(hammer_cursor_t cursor, hammer_btree_leaf_elm_t elm) if (ip) { if (hammer_debug_general & 0x0001) { kprintf("pruning disconnected inode %016llx\n", - elm->base.obj_id); + (long long)elm->base.obj_id); } hammer_rel_inode(ip, 0); hammer_inode_waitreclaims(cursor->trans->hmp); } else { kprintf("unable to prune disconnected inode %016llx\n", - elm->base.obj_id); + (long long)elm->base.obj_id); } } diff --git a/sys/vfs/hammer/hammer_rebalance.c b/sys/vfs/hammer/hammer_rebalance.c index 7dcd65cbb5..9f912d472c 100644 --- a/sys/vfs/hammer/hammer_rebalance.c +++ b/sys/vfs/hammer/hammer_rebalance.c @@ -456,7 +456,7 @@ rebalance_closeout(hammer_node_lock_t base_item, int base_count, */ if (hammer_debug_general & 0x1000) { kprintf("rebalance_closeout %016llx:", - base_item->node->node_offset); + (long long)base_item->node->node_offset); } if (base_item->copy->count != base_count) { base_item->flags |= HAMMER_NODE_LOCK_UPDATED; diff --git a/sys/vfs/hammer/hammer_reblock.c b/sys/vfs/hammer/hammer_reblock.c index f2a0c3e77a..3e4eed4861 100644 --- a/sys/vfs/hammer/hammer_reblock.c +++ b/sys/vfs/hammer/hammer_reblock.c @@ -462,7 +462,8 @@ hammer_reblock_leaf_node(struct hammer_ioc_reblock *reblock, if (hammer_debug_general & 0x4000) { kprintf("REBLOCK LNODE %016llx -> %016llx\n", - onode->node_offset, nnode->node_offset); + (long long)onode->node_offset, + (long long)nnode->node_offset); } hammer_modify_node_done(nnode); cursor->node = nnode; @@ -564,7 +565,8 @@ hammer_reblock_int_node(struct hammer_ioc_reblock *reblock, if (hammer_debug_general & 0x4000) { kprintf("REBLOCK INODE %016llx -> %016llx\n", - onode->node_offset, nnode->node_offset); + (long long)onode->node_offset, + (long long)nnode->node_offset); } hammer_modify_node_done(nnode); cursor->node = nnode; diff --git a/sys/vfs/hammer/hammer_recover.c b/sys/vfs/hammer/hammer_recover.c index 315a5c21dd..8db61e2da1 100644 --- a/sys/vfs/hammer/hammer_recover.c +++ b/sys/vfs/hammer/hammer_recover.c @@ -87,8 +87,9 @@ hammer_recover(hammer_mount_t hmp, hammer_volume_t root_volume) kprintf("HAMMER(%s) Start Recovery %016llx - %016llx " "(%lld bytes of UNDO)%s\n", root_volume->ondisk->vol_name, - first_offset, last_offset, - bytes, + (long long)first_offset, + (long long)last_offset, + (long long)bytes, (hmp->ronly ? " (RO)" : "(RW)")); if (bytes > (rootmap->alloc_offset & HAMMER_OFF_LONG_MASK)) { kprintf("Undo size is absurd, unable to mount\n"); @@ -103,14 +104,15 @@ hammer_recover(hammer_mount_t hmp, hammer_volume_t root_volume) if (scan_offset > rootmap->alloc_offset) { kprintf("HAMMER(%s) UNDO record at %016llx FIFO overflow\n", root_volume->ondisk->vol_name, - scan_offset); + (long long)scan_offset); error = EIO; goto done; } while ((int64_t)bytes > 0) { if (hammer_debug_general & 0x0080) - kprintf("scan_offset %016llx\n", scan_offset); + kprintf("scan_offset %016llx\n", + (long long)scan_offset); if (scan_offset == HAMMER_ZONE_ENCODE(HAMMER_ZONE_UNDO_INDEX, 0)) { scan_offset = rootmap->alloc_offset; continue; @@ -120,7 +122,7 @@ hammer_recover(hammer_mount_t hmp, hammer_volume_t root_volume) kprintf("HAMMER(%s) UNDO record at %016llx FIFO " "underflow\n", root_volume->ondisk->vol_name, - scan_offset); + (long long)scan_offset); error = EIO; break; } @@ -130,7 +132,7 @@ hammer_recover(hammer_mount_t hmp, hammer_volume_t root_volume) kprintf("HAMMER(%s) Unable to read UNDO TAIL " "at %016llx\n", root_volume->ondisk->vol_name, - scan_offset - sizeof(*tail)); + (long long)scan_offset - sizeof(*tail)); break; } @@ -138,7 +140,7 @@ hammer_recover(hammer_mount_t hmp, hammer_volume_t root_volume) kprintf("HAMMER(%s) Illegal UNDO TAIL signature " "at %016llx\n", root_volume->ondisk->vol_name, - scan_offset - sizeof(*tail)); + (long long)scan_offset - sizeof(*tail)); error = EIO; break; } @@ -150,7 +152,7 @@ hammer_recover(hammer_mount_t hmp, hammer_volume_t root_volume) if (error) { kprintf("HAMMER(%s) UNDO record at %016llx failed\n", root_volume->ondisk->vol_name, - scan_offset - tail->tail_size); + (long long)scan_offset - tail->tail_size); break; } scan_offset -= tail->tail_size; @@ -383,7 +385,7 @@ hammer_recover_undo(hammer_mount_t hmp, hammer_volume_t root_volume, if (buffer == NULL) { kprintf("HAMMER: UNDO record, " "cannot access buffer %016llx\n", - undo->undo_offset); + (long long)undo->undo_offset); break; } hammer_modify_buffer(NULL, buffer, NULL, 0); @@ -415,10 +417,12 @@ static void hammer_recover_copy_undo(hammer_off_t undo_offset, char *src, char *dst, int bytes) { - if (hammer_debug_general & 0x0080) - kprintf("UNDO %016llx: %d\n", undo_offset, bytes); + if (hammer_debug_general & 0x0080) { + kprintf("UNDO %016llx: %d\n", + (long long)undo_offset, bytes); + } #if 0 - kprintf("UNDO %016llx:", undo_offset); + kprintf("UNDO %016llx:", (long long)undo_offset); hammer_recover_debug_dump(22, dst, bytes); kprintf("%22s", "to:"); hammer_recover_debug_dump(22, src, bytes); diff --git a/sys/vfs/hammer/hammer_subs.c b/sys/vfs/hammer/hammer_subs.c index dc80364026..a13868292a 100644 --- a/sys/vfs/hammer/hammer_subs.c +++ b/sys/vfs/hammer/hammer_subs.c @@ -494,7 +494,7 @@ hammer_directory_namekey(hammer_inode_t dip, const void *name, int len, key |= 0x100000000LL; if (hammer_debug_general & 0x0400) { kprintf("namekey2: 0x%016llx %*.*s\n", - key, len, len, aname); + (long long)key, len, len, aname); } *max_iterationsp = 0x00FFFFFF; break; @@ -692,7 +692,7 @@ hammer_blockdemarc(int64_t file_offset1, int64_t file_offset2) return(HAMMER_XDEMARC); } panic("hammer_blockdemarc: illegal range %lld %lld\n", - file_offset1, file_offset2); + (long long)file_offset1, (long long)file_offset2); } udev_t diff --git a/sys/vfs/hammer/hammer_transaction.c b/sys/vfs/hammer/hammer_transaction.c index 87281a901a..d923014849 100644 --- a/sys/vfs/hammer/hammer_transaction.c +++ b/sys/vfs/hammer/hammer_transaction.c @@ -165,7 +165,7 @@ hammer_alloc_tid(hammer_mount_t hmp, int count) if (tid >= 0xFFFFFFFFFF000000ULL) panic("hammer_start_transaction: Ran out of TIDs!"); if (hammer_debug_tid) - kprintf("alloc_tid %016llx\n", tid); + kprintf("alloc_tid %016llx\n", (long long)tid); return(tid); } diff --git a/sys/vfs/hammer/hammer_undo.c b/sys/vfs/hammer/hammer_undo.c index 297cf79aa8..d9d097c9ef 100644 --- a/sys/vfs/hammer/hammer_undo.c +++ b/sys/vfs/hammer/hammer_undo.c @@ -168,8 +168,10 @@ again: hammer_modify_buffer_done(buffer); goto again; } - if (hammer_debug_general & 0x0080) - kprintf("undo %016llx %d %d\n", next_offset, bytes, len); + if (hammer_debug_general & 0x0080) { + kprintf("undo %016llx %d %d\n", + (long long)next_offset, bytes, len); + } /* * We're good, create the entry. diff --git a/sys/vfs/hammer/hammer_vfsops.c b/sys/vfs/hammer/hammer_vfsops.c index bb2044c7fe..772958b3e7 100644 --- a/sys/vfs/hammer/hammer_vfsops.c +++ b/sys/vfs/hammer/hammer_vfsops.c @@ -766,7 +766,7 @@ hammer_critical_error(hammer_mount_t hmp, hammer_inode_t ip, krateprintf(&hmp->krate, "HAMMER(%s): Critical error inode=%lld %s\n", hmp->mp->mnt_stat.f_mntfromname, - (ip ? ip->obj_id : -1), msg); + (long long)(ip ? ip->obj_id : -1), msg); if (hmp->ronly == 0) { hmp->ronly = 2; /* special errored read-only mode */ hmp->mp->mnt_flag |= MNT_RDONLY; diff --git a/sys/vfs/hammer/hammer_vnops.c b/sys/vfs/hammer/hammer_vnops.c index a755739afe..65f59f2aaa 100644 --- a/sys/vfs/hammer/hammer_vnops.c +++ b/sys/vfs/hammer/hammer_vnops.c @@ -1021,7 +1021,7 @@ hammer_vop_nlookupdotdot(struct vop_nlookupdotdot_args *ap) asof = dip->hmp->asof; *ap->a_fakename = kmalloc(19, M_TEMP, M_WAITOK); ksnprintf(*ap->a_fakename, 19, "0x%016llx", - dip->obj_asof); + (long long)dip->obj_asof); } else { *ap->a_vpp = NULL; return ENOENT; @@ -1476,7 +1476,7 @@ hammer_vop_readlink(struct vop_readlink_args *ap) /* vap->va_size == 26 */ ksnprintf(buf, sizeof(buf), "@@0x%016llx:%05d", - pfsm->pfsd.sync_end_tid, + (long long)pfsm->pfsd.sync_end_tid, localization >> 16); } else { /* vap->va_size == 10 */ @@ -1486,7 +1486,7 @@ hammer_vop_readlink(struct vop_readlink_args *ap) #if 0 ksnprintf(buf, sizeof(buf), "@@0x%016llx:%05d", - HAMMER_MAX_TID, + (long long)HAMMER_MAX_TID, localization >> 16); #endif } @@ -1899,18 +1899,21 @@ hammer_vop_setattr(struct vop_setattr_args *ap) ip->trunc_off = vap->va_size; #ifdef DEBUG_TRUNCATE if (ip == HammerTruncIp) - kprintf("truncate1 %016llx\n", ip->trunc_off); + kprintf("truncate1 %016llx\n", + (long long)ip->trunc_off); #endif } else if (ip->trunc_off > vap->va_size) { ip->trunc_off = vap->va_size; #ifdef DEBUG_TRUNCATE if (ip == HammerTruncIp) - kprintf("truncate2 %016llx\n", ip->trunc_off); + kprintf("truncate2 %016llx\n", + (long long)ip->trunc_off); #endif } else { #ifdef DEBUG_TRUNCATE if (ip == HammerTruncIp) - kprintf("truncate3 %016llx (ignored)\n", vap->va_size); + kprintf("truncate3 %016llx (ignored)\n", + (long long)vap->va_size); #endif } } @@ -2504,7 +2507,8 @@ hammer_vop_bmap(struct vop_bmap_args *ap) */ hammer_simple_transaction(&trans, ip->hmp); #if 0 - kprintf("bmap_beg %016llx ip->cache %p\n", ap->a_loffset, ip->cache[1]); + kprintf("bmap_beg %016llx ip->cache %p\n", + (long long)ap->a_loffset, ip->cache[1]); #endif hammer_init_cursor(&trans, &cursor, &ip->cache[1], ip); @@ -2609,15 +2613,19 @@ hammer_vop_bmap(struct vop_bmap_args *ap) #if 0 kprintf("BMAP %016llx: %016llx - %016llx\n", - ap->a_loffset, base_offset, last_offset); - kprintf("BMAP %16s: %016llx - %016llx\n", - "", base_disk_offset, last_disk_offset); + (long long)ap->a_loffset, + (long long)base_offset, + (long long)last_offset); + kprintf("BMAP %16s: %016llx - %016llx\n", "", + (long long)base_disk_offset, + (long long)last_disk_offset); #endif if (cursor.node) { hammer_cache_node(&ip->cache[1], cursor.node); #if 0 - kprintf("bmap_end2 %016llx ip->cache %p\n", ap->a_loffset, ip->cache[1]); + kprintf("bmap_end2 %016llx ip->cache %p\n", + (long long)ap->a_loffset, ip->cache[1]); #endif } hammer_done_cursor(&cursor); diff --git a/sys/vfs/hpfs/hpfs_vfsops.c b/sys/vfs/hpfs/hpfs_vfsops.c index e6d1cba3ce..f720d1fee1 100644 --- a/sys/vfs/hpfs/hpfs_vfsops.c +++ b/sys/vfs/hpfs/hpfs_vfsops.c @@ -116,7 +116,7 @@ hpfs_init(struct vfsconf *vcp) static int hpfs_mount(struct mount *mp, char *path, caddr_t data, struct ucred *cred) { - u_int size; + size_t size; int error; struct vnode *devvp; struct hpfs_args args; diff --git a/sys/vfs/nfs/nfs_bio.c b/sys/vfs/nfs/nfs_bio.c index 0799ac6c7e..f6a501a627 100644 --- a/sys/vfs/nfs/nfs_bio.c +++ b/sys/vfs/nfs/nfs_bio.c @@ -975,7 +975,7 @@ again: if (bp->b_dirtyend > bcount) { kprintf("NFS append race @%08llx:%d\n", - bp->b_bio2.bio_offset, + (long long)bp->b_bio2.bio_offset, bp->b_dirtyend - bcount); bp->b_dirtyend = bcount; } diff --git a/sys/vfs/nfs/nfs_vnops.c b/sys/vfs/nfs/nfs_vnops.c index 666d04acb5..824968e640 100644 --- a/sys/vfs/nfs/nfs_vnops.c +++ b/sys/vfs/nfs/nfs_vnops.c @@ -785,7 +785,11 @@ again: */ if (error == 0 && vap->va_size != VNOVAL && np->n_size != vap->va_size) { - kprintf("NFS ftruncate: server disagrees on the file size: %lld/%lld/%lld\n", tsize, vap->va_size, np->n_size); + kprintf("NFS ftruncate: server disagrees on the file size: " + "%lld/%lld/%lld\n", + (long long)tsize, + (long long)vap->va_size, + (long long)np->n_size); goto again; } if (error && vap->va_size != VNOVAL) { @@ -2682,7 +2686,8 @@ nfs_sillyrename(struct vnode *dvp, struct vnode *vp, struct componentname *cnp) vref(dvp); /* Fudge together a funny name */ - sp->s_namlen = ksprintf(sp->s_name, ".nfsA%08x4.4", (int)cnp->cn_td); + sp->s_namlen = ksprintf(sp->s_name, ".nfsA%08x4.4", + (int)(intptr_t)cnp->cn_td); /* Try lookitups until we get one that isn't there */ while (nfs_lookitup(dvp, sp->s_name, sp->s_namlen, sp->s_cred, @@ -3250,7 +3255,7 @@ nfs_print(struct vop_print_args *ap) struct nfsnode *np = VTONFS(vp); kprintf("tag VT_NFS, fileid %lld fsid 0x%x", - np->n_vattr.va_fileid, np->n_vattr.va_fsid); + (long long)np->n_vattr.va_fileid, np->n_vattr.va_fsid); if (vp->v_type == VFIFO) fifo_printinfo(vp); kprintf("\n"); diff --git a/sys/vfs/nullfs/null_vfsops.c b/sys/vfs/nullfs/null_vfsops.c index 919fd3717b..113c44e322 100644 --- a/sys/vfs/nullfs/null_vfsops.c +++ b/sys/vfs/nullfs/null_vfsops.c @@ -74,7 +74,7 @@ nullfs_mount(struct mount *mp, char *path, caddr_t data, struct ucred *cred) struct null_args args; struct vnode *rootvp; struct null_mount *xmp; - u_int size; + size_t size; struct nlookupdata nd; fhandle_t fh; @@ -182,7 +182,7 @@ nullfs_mount(struct mount *mp, char *path, caddr_t data, struct ucred *cred) } (void) copyinstr(args.target, mp->mnt_stat.f_mntfromname, MNAMELEN - 1, - &size); + &size); bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size); (void)nullfs_statfs(mp, &mp->mnt_stat, cred); NULLFSDEBUG("nullfs_mount: lower %s, alias at %s\n", diff --git a/sys/vfs/nwfs/nwfs_vfsops.c b/sys/vfs/nwfs/nwfs_vfsops.c index 9344d1cf82..dcccee2b9e 100644 --- a/sys/vfs/nwfs/nwfs_vfsops.c +++ b/sys/vfs/nwfs/nwfs_vfsops.c @@ -352,7 +352,8 @@ nwfs_init(struct vfsconf *vfsp) { #ifndef SMP int name[2]; - int olen, ncpu, plen, error; + int ncpu, error; + size_t olen, plen; name[0] = CTL_HW; name[1] = HW_NCPU; diff --git a/sys/vfs/portal/portal_vfsops.c b/sys/vfs/portal/portal_vfsops.c index 2d4603f21e..da22adc829 100644 --- a/sys/vfs/portal/portal_vfsops.c +++ b/sys/vfs/portal/portal_vfsops.c @@ -81,7 +81,7 @@ portal_mount(struct mount *mp, char *path, caddr_t data, struct ucred *cred) struct socket *so; struct vnode *rvp; struct portalnode *pn; - u_int size; + size_t size; int error; /* diff --git a/sys/vfs/smbfs/smbfs_smb.c b/sys/vfs/smbfs/smbfs_smb.c index 0b53adcc96..8c169422ce 100644 --- a/sys/vfs/smbfs/smbfs_smb.c +++ b/sys/vfs/smbfs/smbfs_smb.c @@ -137,7 +137,8 @@ smbfs_smb_lock(struct smbnode *np, int op, caddr_t id, */ return EINVAL; else - return smbfs_smb_lockandx(np, op, (u_int32_t)id, start, end, scred); + return smbfs_smb_lockandx(np, op, (u_int32_t)(uintptr_t)id, + start, end, scred); } int diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 9a8d7511d4..f8fb496704 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -872,7 +872,9 @@ swap_pager_strategy(vm_object_t object, struct bio *bio) bp->b_error = EINVAL; bp->b_flags |= B_ERROR | B_INVAL; biodone(bio); - kprintf("swap_pager_strategy: bp %p offset %lld size %d, not page bounded\n", bp, bio->bio_offset, (int)bp->b_bcount); + kprintf("swap_pager_strategy: bp %p offset %lld size %d, " + "not page bounded\n", + bp, (long long)bio->bio_offset, (int)bp->b_bcount); return; } @@ -1254,7 +1256,7 @@ swap_pager_getpages(vm_object_t object, vm_page_t *m, int count, int reqpage) bp->b_bcount = PAGE_SIZE * (j - i); bio->bio_done = swp_pager_async_iodone; bio->bio_offset = (off_t)(blk - (reqpage - i)) << PAGE_SHIFT; - bio->bio_driver_info = (void *)(reqpage - i); + bio->bio_driver_info = (void *)(intptr_t)(reqpage - i); { int k; @@ -1305,8 +1307,9 @@ swap_pager_getpages(vm_object_t object, vm_page_t *m, int count, int reqpage) if (tsleep(mreq, 0, "swread", hz*20)) { kprintf( "swap_pager: indefinite wait buffer: " - " offset: %lld, size: %d\n", - bio->bio_offset, bp->b_bcount + " offset: %lld, size: %ld\n", + (long long)bio->bio_offset, + (long)bp->b_bcount ); } } @@ -1614,7 +1617,7 @@ swp_pager_async_iodone(struct bio *bio) "swap_pager: I/O error - %s failed; offset %lld," "size %ld, error %d\n", ((bp->b_cmd == BUF_CMD_READ) ? "pagein" : "pageout"), - bio->bio_offset, + (long long)bio->bio_offset, (long)bp->b_bcount, bp->b_error ); @@ -1687,7 +1690,7 @@ swp_pager_async_iodone(struct bio *bio) * bio_driver_info holds the requested page * index. */ - if (i != (int)bio->bio_driver_info) { + if (i != (int)(intptr_t)bio->bio_driver_info) { vm_page_deactivate(m); vm_page_wakeup(m); } else { @@ -1749,7 +1752,7 @@ swp_pager_async_iodone(struct bio *bio) * * bio_driver_info holds the requested page */ - if (i != (int)bio->bio_driver_info) { + if (i != (int)(intptr_t)bio->bio_driver_info) { vm_page_deactivate(m); vm_page_wakeup(m); } else { diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h index b0405c6d90..22d4ed4a31 100644 --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -101,6 +101,10 @@ #include #endif +#ifdef __amd64__ +#include +#endif + #endif typedef enum vm_page_event { VMEVENT_NONE, VMEVENT_COW } vm_page_event_t; @@ -604,6 +608,18 @@ vm_page_free(vm_page_t m) static __inline void vm_page_free_zero(vm_page_t m) { +#ifdef __amd64__ + /* JG DEBUG64 We check if the page is really zeroed. */ + char *p = (char *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(m)); + int i; + + for (i = 0; i < PAGE_SIZE; i++) { + if (p[i] != 0) { + panic("non-zero page in vm_page_free_zero()"); + } + } + +#endif vm_page_flag_set(m, PG_ZERO); vm_page_free_toq(m); } diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c index 9e60befa60..59edb02f69 100644 --- a/sys/vm/vm_pager.c +++ b/sys/vm/vm_pager.c @@ -218,7 +218,7 @@ vm_pager_bufferinit(void) */ bp = swbuf; for (i = 0; i < nswbuf; ++i, ++bp) { - bp->b_kvabase = (caddr_t)(i * MAXPHYS) + swapbkva; + bp->b_kvabase = (caddr_t)((intptr_t)i * MAXPHYS) + swapbkva; bp->b_kvasize = MAXPHYS; TAILQ_INSERT_HEAD(&bswlist, bp, b_freelist); BUF_LOCKINIT(bp); diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 061ce6cb72..c3ad39c68b 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -150,8 +150,12 @@ vnode_pager_alloc(void *handle, off_t size, vm_prot_t prot, off_t offset) vp->v_filesize = size; } else { object->ref_count++; - if (vp->v_filesize != size) - kprintf("vnode_pager_alloc: Warning, filesize mismatch %lld/%lld\n", vp->v_filesize, size); + if (vp->v_filesize != size) { + kprintf("vnode_pager_alloc: Warning, filesize " + "mismatch %lld/%lld\n", + (long long)vp->v_filesize, + (long long)size); + } } vref(vp); -- 2.41.0