system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-15 04:43:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix various places which cast a pointer to a vm_paddr_t or vice versa.

Browse source 
GCC warns about the mismatched sizes on i386 where vm_paddr_t is 64
bits.

Reviewed by:	imp, markj
Differential Revision:	https://reviews.freebsd.org/D36750
This commit is contained in:
John Baldwin 2022-10-03 16:10:41 -07:00
parent 56cdab3372
commit a9fca3b987
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/dev/dcons/dcons_os.c
View file

@ -331,7 +331,7 @@ dcons_drv_init(int stage)
#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;

4
sys/dev/fb/fbd.c
View file

@ -210,8 +210,8 @@ fbd_list(void)
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);

2
sys/vm/vm_dumpset.h
View file

@ -92,7 +92,7 @@ vm_page_dump_index_to_pa(int bit)
(dump_avail[i] & ~PAGE_MASK));
bit -= tot;
}
return ((vm_paddr_t)NULL);
return (0);
}
#define VM_PAGE_DUMP_FOREACH(bitset, pa) \

2
sys/x86/xen/hvm.c
View file

@ -197,7 +197,7 @@ xen_hvm_init_hypercall_stubs(enum xen_hvm_init_type init_type)
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);