3 files changed, 9 insertions, 8 deletions

diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index fd5ac272a441..dc31d3702531 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -5928,7 +5928,7 @@ __CONCAT(PMTYPE, align_superpage)(vm_object_t object, vm_ooffset_t offset,
 		*addr = ((*addr + PDRMASK) & ~PDRMASK) + superpage_offset;
 }
 
-static vm_offset_t
+static void *
 __CONCAT(PMTYPE, quick_enter_page)(vm_page_t m)
 {
 	vm_offset_t qaddr;
@@ -5944,11 +5944,11 @@ __CONCAT(PMTYPE, quick_enter_page)(vm_page_t m)
 	    pmap_cache_bits(kernel_pmap, pmap_page_get_memattr(m), false);
 	invlpg(qaddr);
 
-	return (qaddr);
+	return ((void *)qaddr);
 }
 
 static void
-__CONCAT(PMTYPE, quick_remove_page)(vm_offset_t addr)
+__CONCAT(PMTYPE, quick_remove_page)(void *addr)
 {
 	vm_offset_t qaddr;
 	pt_entry_t *pte;
@@ -5957,7 +5957,8 @@ __CONCAT(PMTYPE, quick_remove_page)(vm_offset_t addr)
 	pte = vtopte(qaddr);
 
 	KASSERT(*pte != 0, ("pmap_quick_remove_page: PTE not in use"));
-	KASSERT(addr == qaddr, ("pmap_quick_remove_page: invalid address"));
+	KASSERT(addr == (void *)qaddr,
+	    ("pmap_quick_remove_page: invalid address"));
 
 	*pte = 0;
 	critical_exit();
diff --git a/sys/i386/i386/pmap_base.c b/sys/i386/i386/pmap_base.c
index cdbfd688f110..ed084947cece 100644
--- a/sys/i386/i386/pmap_base.c
+++ b/sys/i386/i386/pmap_base.c
@@ -432,7 +432,7 @@ pmap_align_superpage(vm_object_t object, vm_ooffset_t offset,
 	    addr, size));
 }
 
-vm_offset_t
+void *
 pmap_quick_enter_page(vm_page_t m)
 {
 
@@ -440,7 +440,7 @@ pmap_quick_enter_page(vm_page_t m)
 }
 
 void
-pmap_quick_remove_page(vm_offset_t addr)
+pmap_quick_remove_page(void *addr)
 {
 
 	return (pmap_methods_ptr->pm_quick_remove_page(addr));
diff --git a/sys/i386/include/pmap_base.h b/sys/i386/include/pmap_base.h
index 20f814195281..9771361d674e 100644
--- a/sys/i386/include/pmap_base.h
+++ b/sys/i386/include/pmap_base.h
@@ -40,8 +40,8 @@ struct pmap_methods {
 	void (*pm_remap_lowptdi)(bool);
 	void (*pm_align_superpage)(vm_object_t object, vm_ooffset_t offset,
 	    vm_offset_t *addr, vm_size_t size);
-	vm_offset_t (*pm_quick_enter_page)(vm_page_t m);
-	void (*pm_quick_remove_page)(vm_offset_t addr);
+	void *(*pm_quick_enter_page)(vm_page_t m);
+	void (*pm_quick_remove_page)(void *addr);
 	void *(*pm_trm_alloc)(size_t size, int flags);
 	void (*pm_trm_free)(void *addr, size_t size);
 	vm_offset_t (*pm_get_map_low)(void);