3 files changed, 20 insertions, 20 deletions

diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c
index adf5fd10e3de..2e99b7deeac7 100644
--- a/sys/powerpc/aim/mmu_oea.c
+++ b/sys/powerpc/aim/mmu_oea.c
@@ -323,8 +323,8 @@ int moea_dev_direct_mapped(vm_paddr_t, vm_size_t);
 static void moea_sync_icache(pmap_t, vm_offset_t, vm_size_t);
 void moea_dumpsys_map(vm_paddr_t pa, size_t sz, void **va);
 void moea_scan_init(void);
-vm_offset_t moea_quick_enter_page(vm_page_t m);
-void moea_quick_remove_page(vm_offset_t addr);
+void *moea_quick_enter_page(vm_page_t m);
+void moea_quick_remove_page(void *addr);
 bool moea_page_is_mapped(vm_page_t m);
 bool moea_ps_enabled(pmap_t pmap);
 static int moea_map_user_ptr(pmap_t pm,
@@ -1104,15 +1104,15 @@ moea_zero_page_area(vm_page_t m, int off, int size)
 	bzero(va, size);
 }
 
-vm_offset_t
+void *
 moea_quick_enter_page(vm_page_t m)
 {
 
-	return (VM_PAGE_TO_PHYS(m));
+	return ((void *)VM_PAGE_TO_PHYS(m));
 }
 
 void
-moea_quick_remove_page(vm_offset_t addr)
+moea_quick_remove_page(void *addr)
 {
 }
 
diff --git a/sys/powerpc/aim/mmu_oea64.c b/sys/powerpc/aim/mmu_oea64.c
index 247bd30e6bd4..23172dbd807b 100644
--- a/sys/powerpc/aim/mmu_oea64.c
+++ b/sys/powerpc/aim/mmu_oea64.c
@@ -404,9 +404,9 @@ static void moea64_sync_icache(pmap_t, vm_offset_t, vm_size_t);
 void moea64_dumpsys_map(vm_paddr_t pa, size_t sz,
     void **va);
 void moea64_scan_init(void);
-vm_offset_t moea64_quick_enter_page(vm_page_t m);
-vm_offset_t moea64_quick_enter_page_dmap(vm_page_t m);
-void moea64_quick_remove_page(vm_offset_t addr);
+void *moea64_quick_enter_page(vm_page_t m);
+void *moea64_quick_enter_page_dmap(vm_page_t m);
+void moea64_quick_remove_page(void *addr);
 bool moea64_page_is_mapped(vm_page_t m);
 static int moea64_map_user_ptr(pmap_t pm,
     volatile const void *uaddr, void **kaddr, size_t ulen, size_t *klen);
@@ -1554,7 +1554,7 @@ moea64_zero_page_dmap(vm_page_t m)
 	bzero((void *)va, PAGE_SIZE);
 }
 
-vm_offset_t
+void *
 moea64_quick_enter_page(vm_page_t m)
 {
 	struct pvo_entry *pvo;
@@ -1577,22 +1577,22 @@ moea64_quick_enter_page(vm_page_t m)
 	moea64_pte_replace(pvo, MOEA64_PTE_INVALIDATE);
 	isync();
 
-	return (PCPU_GET(qmap_addr));
+	return ((void *)PCPU_GET(qmap_addr));
 }
 
-vm_offset_t
+void *
 moea64_quick_enter_page_dmap(vm_page_t m)
 {
 
-	return (PHYS_TO_DMAP(VM_PAGE_TO_PHYS(m)));
+	return ((void *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(m)));
 }
 
 void
-moea64_quick_remove_page(vm_offset_t addr)
+moea64_quick_remove_page(void *addr)
 {
 
 	mtx_assert(PCPU_PTR(aim.qmap_lock), MA_OWNED);
-	KASSERT(PCPU_GET(qmap_addr) == addr,
+	KASSERT((void *)PCPU_GET(qmap_addr) == addr,
 	    ("moea64_quick_remove_page: invalid address"));
 	mtx_unlock(PCPU_PTR(aim.qmap_lock));
 	sched_unpin();	
diff --git a/sys/powerpc/aim/mmu_radix.c b/sys/powerpc/aim/mmu_radix.c
index 1fc8a23269e5..eaf9b39dde8f 100644
--- a/sys/powerpc/aim/mmu_radix.c
+++ b/sys/powerpc/aim/mmu_radix.c
@@ -454,8 +454,8 @@ void mmu_radix_protect(pmap_t, vm_offset_t, vm_offset_t, vm_prot_t);
 bool mmu_radix_ps_enabled(pmap_t);
 void mmu_radix_qenter(vm_offset_t, vm_page_t *, int);
 void mmu_radix_qremove(vm_offset_t, int);
-vm_offset_t mmu_radix_quick_enter_page(vm_page_t);
-void mmu_radix_quick_remove_page(vm_offset_t);
+void *mmu_radix_quick_enter_page(vm_page_t);
+void mmu_radix_quick_remove_page(void *);
 int mmu_radix_ts_referenced(vm_page_t);
 void mmu_radix_release(pmap_t);
 void mmu_radix_remove(pmap_t, vm_offset_t, vm_offset_t);
@@ -6178,21 +6178,21 @@ mmu_radix_dumpsys_map(vm_paddr_t pa, size_t sz,
 	UNIMPLEMENTED();
 }
 
-vm_offset_t
+void *
 mmu_radix_quick_enter_page(vm_page_t m)
 {
 	vm_paddr_t paddr;
 
 	CTR2(KTR_PMAP, "%s(%p)", __func__, m);
 	paddr = VM_PAGE_TO_PHYS(m);
-	return (PHYS_TO_DMAP(paddr));
+	return ((void *)PHYS_TO_DMAP(paddr));
 }
 
 void
-mmu_radix_quick_remove_page(vm_offset_t addr __unused)
+mmu_radix_quick_remove_page(void *addr __unused)
 {
 	/* no work to do here */
-	CTR2(KTR_PMAP, "%s(%#x)", __func__, addr);
+	CTR2(KTR_PMAP, "%s(%p)", __func__, addr);
 }
 
 static void