svn commit: r342199 - stable/12/sys/x86/x86

Mark Johnston markj at FreeBSD.org
Tue Dec 18 20:12:45 UTC 2018


Author: markj
Date: Tue Dec 18 20:12:43 2018
New Revision: 342199
URL: https://svnweb.freebsd.org/changeset/base/342199

Log:
  MFC r341821:
  Fix the PAE kernel gcc build.

Modified:
  stable/12/sys/x86/x86/ucode.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/x86/x86/ucode.c
==============================================================================
--- stable/12/sys/x86/x86/ucode.c	Tue Dec 18 19:38:28 2018	(r342198)
+++ stable/12/sys/x86/x86/ucode.c	Tue Dec 18 20:12:43 2018	(r342199)
@@ -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;


More information about the svn-src-all mailing list