Migrate pmap_prefault() into the machine-independent virtual memory layer.

A small helper function pmap_is_prefaultable() is added.  This function
encapsulate the few lines of pmap_prefault() that actually vary from
machine to machine.  Note: pmap_is_prefaultable() and pmap_mincore() have
much in common.  Going forward, it's worth considering their merger.

3 files changed, 39 insertions, 24 deletions

diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c
index 1c789f7..30ce2f8 100644
--- a/sys/powerpc/aim/mmu_oea.c
+++ b/sys/powerpc/aim/mmu_oea.c
@@ -1117,6 +1117,19 @@ pmap_is_modified(vm_page_t m)
 	return (pmap_query_bit(m, PTE_CHG));
 }
 
+/*
+ *	pmap_is_prefaultable:
+ *
+ *	Return whether or not the specified virtual address is elgible
+ *	for prefault.
+ */
+boolean_t
+pmap_is_prefaultable(pmap_t pmap, vm_offset_t addr)
+{
+
+	return (FALSE);
+}
+
 void
 pmap_clear_reference(vm_page_t m)
 {
@@ -1424,14 +1437,6 @@ pmap_pinit2(pmap_t pmap)
 	/* XXX: Remove this stub when no longer called */
 }
 
-void
-pmap_prefault(pmap_t pm, vm_offset_t va, vm_map_entry_t entry)
-{
-	KASSERT(pm == &curproc->p_vmspace->vm_pmap || pm == kernel_pmap,
-	    ("pmap_prefault: non current pmap"));
-	/* XXX */
-}
-
 /*
  * Set the physical protection on the specified range of this map as requested.
  */
diff --git a/sys/powerpc/powerpc/mmu_oea.c b/sys/powerpc/powerpc/mmu_oea.c
index 1c789f7..30ce2f8 100644
--- a/sys/powerpc/powerpc/mmu_oea.c
+++ b/sys/powerpc/powerpc/mmu_oea.c
@@ -1117,6 +1117,19 @@ pmap_is_modified(vm_page_t m)
 	return (pmap_query_bit(m, PTE_CHG));
 }
 
+/*
+ *	pmap_is_prefaultable:
+ *
+ *	Return whether or not the specified virtual address is elgible
+ *	for prefault.
+ */
+boolean_t
+pmap_is_prefaultable(pmap_t pmap, vm_offset_t addr)
+{
+
+	return (FALSE);
+}
+
 void
 pmap_clear_reference(vm_page_t m)
 {
@@ -1424,14 +1437,6 @@ pmap_pinit2(pmap_t pmap)
 	/* XXX: Remove this stub when no longer called */
 }
 
-void
-pmap_prefault(pmap_t pm, vm_offset_t va, vm_map_entry_t entry)
-{
-	KASSERT(pm == &curproc->p_vmspace->vm_pmap || pm == kernel_pmap,
-	    ("pmap_prefault: non current pmap"));
-	/* XXX */
-}
-
 /*
  * Set the physical protection on the specified range of this map as requested.
  */
diff --git a/sys/powerpc/powerpc/pmap.c b/sys/powerpc/powerpc/pmap.c
index 1c789f7..30ce2f8 100644
--- a/sys/powerpc/powerpc/pmap.c
+++ b/sys/powerpc/powerpc/pmap.c
@@ -1117,6 +1117,19 @@ pmap_is_modified(vm_page_t m)
 	return (pmap_query_bit(m, PTE_CHG));
 }
 
+/*
+ *	pmap_is_prefaultable:
+ *
+ *	Return whether or not the specified virtual address is elgible
+ *	for prefault.
+ */
+boolean_t
+pmap_is_prefaultable(pmap_t pmap, vm_offset_t addr)
+{
+
+	return (FALSE);
+}
+
 void
 pmap_clear_reference(vm_page_t m)
 {
@@ -1424,14 +1437,6 @@ pmap_pinit2(pmap_t pmap)
 	/* XXX: Remove this stub when no longer called */
 }
 
-void
-pmap_prefault(pmap_t pm, vm_offset_t va, vm_map_entry_t entry)
-{
-	KASSERT(pm == &curproc->p_vmspace->vm_pmap || pm == kernel_pmap,
-	    ("pmap_prefault: non current pmap"));
-	/* XXX */
-}
-
 /*
  * Set the physical protection on the specified range of this map as requested.
  */