From b59887227d3dc9285f2e370f4589e4ae8c99bc15 Mon Sep 17 00:00:00 2001
From: markj <markj@FreeBSD.org>
Date: Tue, 11 Dec 2018 16:49:01 +0000
Subject: [PATCH] Fix the PAE kernel gcc build.

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
---
 sys/x86/x86/ucode.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/sys/x86/x86/ucode.c b/sys/x86/x86/ucode.c
index c0810ae7eb21..93f82e37eb66 100644
--- a/sys/x86/x86/ucode.c
+++ b/sys/x86/x86/ucode.c
@@ -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;