10 files changed, 0 insertions, 139 deletions

diff --git a/sys/alpha/alpha/pmap.c b/sys/alpha/alpha/pmap.c
index dd3800e4c47b..8761537f8630 100644
--- a/sys/alpha/alpha/pmap.c
+++ b/sys/alpha/alpha/pmap.c
@@ -2556,29 +2556,6 @@ pmap_copy_page(vm_page_t msrc, vm_page_t mdst)
 	bcopy((caddr_t) src, (caddr_t) dst, PAGE_SIZE);
 }
 
-
-/*
- *	Routine:	pmap_pageable
- *	Function:
- *		Make the specified pages (by pmap, offset)
- *		pageable (or not) as requested.
- *
- *		A page which is not pageable may not take
- *		a fault; therefore, its page table entry
- *		must remain valid for the duration.
- *
- *		This routine is merely advisory; pmap_enter
- *		will specify that these pages are to be wired
- *		down (or not) as appropriate.
- */
-void
-pmap_pageable(pmap, sva, eva, pageable)
-	pmap_t pmap;
-	vm_offset_t sva, eva;
-	boolean_t pageable;
-{
-}
-
 /*
  * Returns true if the pmap's pv is one of the first
  * 16 pvs linked to from this page.  This count may
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 274678ed3453..1318ebb9eb0b 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -2865,29 +2865,6 @@ pmap_copy_page(vm_page_t src, vm_page_t dst)
 	*CMAP2 = 0;
 }
 
-
-/*
- *	Routine:	pmap_pageable
- *	Function:
- *		Make the specified pages (by pmap, offset)
- *		pageable (or not) as requested.
- *
- *		A page which is not pageable may not take
- *		a fault; therefore, its page table entry
- *		must remain valid for the duration.
- *
- *		This routine is merely advisory; pmap_enter
- *		will specify that these pages are to be wired
- *		down (or not) as appropriate.
- */
-void
-pmap_pageable(pmap, sva, eva, pageable)
-	pmap_t pmap;
-	vm_offset_t sva, eva;
-	boolean_t pageable;
-{
-}
-
 /*
  * Returns true if the pmap's pv is one of the first
  * 16 pvs linked to from this page.  This count may
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 274678ed3453..1318ebb9eb0b 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -2865,29 +2865,6 @@ pmap_copy_page(vm_page_t src, vm_page_t dst)
 	*CMAP2 = 0;
 }
 
-
-/*
- *	Routine:	pmap_pageable
- *	Function:
- *		Make the specified pages (by pmap, offset)
- *		pageable (or not) as requested.
- *
- *		A page which is not pageable may not take
- *		a fault; therefore, its page table entry
- *		must remain valid for the duration.
- *
- *		This routine is merely advisory; pmap_enter
- *		will specify that these pages are to be wired
- *		down (or not) as appropriate.
- */
-void
-pmap_pageable(pmap, sva, eva, pageable)
-	pmap_t pmap;
-	vm_offset_t sva, eva;
-	boolean_t pageable;
-{
-}
-
 /*
  * Returns true if the pmap's pv is one of the first
  * 16 pvs linked to from this page.  This count may
diff --git a/sys/ia64/ia64/pmap.c b/sys/ia64/ia64/pmap.c
index 202a9b3785bc..114bb15e6251 100644
--- a/sys/ia64/ia64/pmap.c
+++ b/sys/ia64/ia64/pmap.c
@@ -2075,27 +2075,6 @@ pmap_copy_page(vm_page_t msrc, vm_page_t mdst)
 	bcopy((caddr_t) src, (caddr_t) dst, PAGE_SIZE);
 }
 
-
-/*
- *	Routine:	pmap_pageable
- *	Function:
- *		Make the specified pages (by pmap, offset)
- *		pageable (or not) as requested.
- *
- *		A page which is not pageable may not take
- *		a fault; therefore, its page table entry
- *		must remain valid for the duration.
- *
- *		This routine is merely advisory; pmap_enter
- *		will specify that these pages are to be wired
- *		down (or not) as appropriate.
- */
-void
-pmap_pageable(pmap_t pmap, vm_offset_t sva, vm_offset_t eva,
-	      boolean_t pageable)
-{
-}
-
 /*
  * Returns true if the pmap's pv is one of the first
  * 16 pvs linked to from this page.  This count may
diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c
index 8e2fa7f2481d..efe422a36a14 100644
--- a/sys/powerpc/aim/mmu_oea.c
+++ b/sys/powerpc/aim/mmu_oea.c
@@ -1280,15 +1280,6 @@ pmap_page_protect(vm_page_t m, vm_prot_t prot)
 }
 
 /*
- * Make the specified page pageable (or not).  Unneeded.
- */
-void
-pmap_pageable(pmap_t pmap, vm_offset_t sva, vm_offset_t eva,
-	      boolean_t pageable)
-{
-}
-
-/*
  * Returns true if the pmap's pv is one of the first
  * 16 pvs linked to from this page.  This count may
  * be changed upwards or downwards in the future; it
diff --git a/sys/powerpc/powerpc/mmu_oea.c b/sys/powerpc/powerpc/mmu_oea.c
index 8e2fa7f2481d..efe422a36a14 100644
--- a/sys/powerpc/powerpc/mmu_oea.c
+++ b/sys/powerpc/powerpc/mmu_oea.c
@@ -1280,15 +1280,6 @@ pmap_page_protect(vm_page_t m, vm_prot_t prot)
 }
 
 /*
- * Make the specified page pageable (or not).  Unneeded.
- */
-void
-pmap_pageable(pmap_t pmap, vm_offset_t sva, vm_offset_t eva,
-	      boolean_t pageable)
-{
-}
-
-/*
  * Returns true if the pmap's pv is one of the first
  * 16 pvs linked to from this page.  This count may
  * be changed upwards or downwards in the future; it
diff --git a/sys/powerpc/powerpc/pmap.c b/sys/powerpc/powerpc/pmap.c
index 8e2fa7f2481d..efe422a36a14 100644
--- a/sys/powerpc/powerpc/pmap.c
+++ b/sys/powerpc/powerpc/pmap.c
@@ -1280,15 +1280,6 @@ pmap_page_protect(vm_page_t m, vm_prot_t prot)
 }
 
 /*
- * Make the specified page pageable (or not).  Unneeded.
- */
-void
-pmap_pageable(pmap_t pmap, vm_offset_t sva, vm_offset_t eva,
-	      boolean_t pageable)
-{
-}
-
-/*
  * Returns true if the pmap's pv is one of the first
  * 16 pvs linked to from this page.  This count may
  * be changed upwards or downwards in the future; it
diff --git a/sys/sparc64/sparc64/pmap.c b/sys/sparc64/sparc64/pmap.c
index 789130bee9b7..8036e217da5f 100644
--- a/sys/sparc64/sparc64/pmap.c
+++ b/sys/sparc64/sparc64/pmap.c
@@ -1597,15 +1597,6 @@ pmap_copy_page(vm_page_t msrc, vm_page_t mdst)
 }
 
 /*
- * Make the specified page pageable (or not).  Unneeded.
- */
-void
-pmap_pageable(pmap_t pmap, vm_offset_t sva, vm_offset_t eva,
-	      boolean_t pageable)
-{
-}
-
-/*
  * Returns true if the pmap's pv is one of the first
  * 16 pvs linked to from this page.  This count may
  * be changed upwards or downwards in the future; it
diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h
index 23e3c4363847..2ea797ee5069 100644
--- a/sys/vm/pmap.h
+++ b/sys/vm/pmap.h
@@ -113,7 +113,6 @@ void		 pmap_object_init_pt(pmap_t pmap, vm_offset_t addr,
 		    int pagelimit);
 boolean_t	 pmap_page_exists_quick(pmap_t pmap, vm_page_t m);
 void		 pmap_page_protect(vm_page_t m, vm_prot_t prot);
-void		 pmap_pageable(pmap_t, vm_offset_t, vm_offset_t, boolean_t);
 vm_offset_t	 pmap_phys_address(int);
 void		 pmap_pinit(pmap_t);
 void		 pmap_pinit0(pmap_t);
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index a7cec52a771f..37ff14231ba6 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -932,12 +932,6 @@ vm_fault_wire(map, start, end, user_wire)
 	int rv;
 
 	/*
-	 * Inform the physical mapping system that the range of addresses may
-	 * not fault, so that page tables and such can be locked down as well.
-	 */
-	pmap_pageable(map->pmap, start, end, FALSE);
-
-	/*
 	 * We simulate a fault to get the page and enter it in the physical
 	 * map.  For user wiring, we only ask for read access on currently
 	 * read-only sections.
@@ -985,12 +979,6 @@ vm_fault_unwire(map, start, end)
 		}
 	}
 	mtx_unlock(&Giant);
-
-	/*
-	 * Inform the physical mapping system that the range of addresses may
-	 * fault, so that page tables and such may be unwired themselves.
-	 */
-	pmap_pageable(pmap, start, end, TRUE);
 }
 
 /*