d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the PAE kernel gcc build.

Browse Source 
The error was caused by map_ucode() casting a vm_paddr_t to a void *.
Use a uintptr_t instead to match the caller.  Fix some style bugs while
here.

Reported by:	bde
Reviewed by:	bde
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
markj 2018-12-11 16:49:01 +00:00
parent 1b02aef1b6
commit b59887227d
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/x86/x86/ucode.c
View File

@ -278,12 +278,13 @@ ucode_load_ap(int cpu)
}
static void *
map_ucode(vm_paddr_t free, size_t len)
map_ucode(uintptr_t free, size_t len)
{
#ifdef __i386__
for (vm_paddr_t pa = free; pa < free + len; pa += PAGE_SIZE)
pmap_kenter(pa, pa);
uintptr_t va;
for (va = free; va < free + len; va += PAGE_SIZE)
pmap_kenter(va, (vm_paddr_t)va);
#else
(void)len;
#endif
@ -291,12 +292,13 @@ map_ucode(vm_paddr_t free, size_t len)
}
static void
unmap_ucode(vm_paddr_t free, size_t len)
unmap_ucode(uintptr_t free, size_t len)
{
#ifdef __i386__
for (vm_paddr_t pa = free; pa < free + len; pa += PAGE_SIZE)
pmap_kremove((vm_offset_t)pa);
uintptr_t va;
for (va = free; va < free + len; va += PAGE_SIZE)
pmap_kremove(va);
#else
(void)free;
(void)len;