diff --git a/sys/dev/dcons/dcons_os.c b/sys/dev/dcons/dcons_os.c --- a/sys/dev/dcons/dcons_os.c +++ b/sys/dev/dcons/dcons_os.c @@ -331,7 +331,7 @@ #ifdef __amd64__ dg.buf = (struct dcons_buf *)(vm_offset_t)(KERNBASE + addr); #else /* __i386__ */ - dg.buf = (struct dcons_buf *)((vm_offset_t)PMAP_MAP_LOW + + dg.buf = (struct dcons_buf *)(vm_offset_t)(PMAP_MAP_LOW + addr); #endif dg.size = size; diff --git a/sys/dev/fb/fbd.c b/sys/dev/fb/fbd.c --- a/sys/dev/fb/fbd.c +++ b/sys/dev/fb/fbd.c @@ -210,8 +210,8 @@ return (ENOENT); LIST_FOREACH(entry, &fb_list_head, fb_list) { - printf("FB %s @%p\n", entry->fb_info->fb_name, - (void *)entry->fb_info->fb_pbase); + printf("FB %s @%#jx\n", entry->fb_info->fb_name, + (uintmax_t)entry->fb_info->fb_pbase); } return (0); diff --git a/sys/vm/vm_dumpset.h b/sys/vm/vm_dumpset.h --- a/sys/vm/vm_dumpset.h +++ b/sys/vm/vm_dumpset.h @@ -92,7 +92,7 @@ (dump_avail[i] & ~PAGE_MASK)); bit -= tot; } - return ((vm_paddr_t)NULL); + return (0); } #define VM_PAGE_DUMP_FOREACH(bitset, pa) \ diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c --- a/sys/x86/xen/hvm.c +++ b/sys/x86/xen/hvm.c @@ -197,7 +197,7 @@ return (EINVAL); wrmsr(regs[1], (init_type == XEN_HVM_INIT_EARLY) - ? ((vm_paddr_t)&hypercall_page - KERNBASE) + ? (vm_paddr_t)((uintptr_t)&hypercall_page - KERNBASE) : vtophys(&hypercall_page)); return (0);