Get rid of the last traces of uvm.pager_[se]va

4 files changed, 7 insertions, 27 deletions

diff --git a/sys/arch/alpha/alpha/pmap.c b/sys/arch/alpha/alpha/pmap.c
index 255a9a19dd6..f38d48da34c 100644
--- a/sys/arch/alpha/alpha/pmap.c
+++ b/sys/arch/alpha/alpha/pmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.c,v 1.58 2008/10/23 23:54:02 tedu Exp $ */
+/* $OpenBSD: pmap.c,v 1.59 2009/01/27 22:14:12 miod Exp $ */
 /* $NetBSD: pmap.c,v 1.154 2000/12/07 22:18:55 thorpej Exp $ */
 
 /*-
@@ -2711,15 +2711,6 @@ pmap_changebit(paddr_t pa, u_long set, u_long mask, cpuid_t cpu_id)
 	     pv = LIST_NEXT(pv, pv_list)) {
 		va = pv->pv_va;
 
-		/*
-		 * XXX don't write protect pager mappings
-		 */
-		if (pv->pv_pmap == pmap_kernel() &&
-/* XXX */	    mask == ~(PG_KWE | PG_UWE)) {
-			if (va >= uvm.pager_sva && va < uvm.pager_eva)
-				continue;
-		}
-
 		PMAP_LOCK(pv->pv_pmap);
 
 		pte = pv->pv_pte;
diff --git a/sys/arch/i386/i386/pmap.c b/sys/arch/i386/i386/pmap.c
index 4b7337cdded..7e3ebfe7cd6 100644
--- a/sys/arch/i386/i386/pmap.c
+++ b/sys/arch/i386/i386/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.134 2008/12/18 14:17:28 kurt Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.135 2009/01/27 22:14:13 miod Exp $	*/
 /*	$NetBSD: pmap.c,v 1.91 2000/06/02 17:46:37 thorpej Exp $	*/
 
 /*
@@ -2118,8 +2118,6 @@ pmap_page_remove(struct vm_page *pg)
 		ptes = pmap_map_ptes(pve->pv_pmap);	/* locks pmap */
 
 #ifdef DIAGNOSTIC
-		if (pve->pv_va >= uvm.pager_sva && pve->pv_va < uvm.pager_eva)
-			printf("pmap_page_remove: found pager VA on pv_list\n");
 		if (pve->pv_ptp && (pve->pv_pmap->pm_pdir[pdei(pve->pv_va)] &
 				    PG_FRAME)
 		    != VM_PAGE_TO_PHYS(pve->pv_ptp)) {
diff --git a/sys/arch/i386/i386/pmapae.c b/sys/arch/i386/i386/pmapae.c
index 1438f652965..683d282379a 100644
--- a/sys/arch/i386/i386/pmapae.c
+++ b/sys/arch/i386/i386/pmapae.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmapae.c,v 1.14 2007/11/16 16:16:06 deraadt Exp $	*/
+/*	$OpenBSD: pmapae.c,v 1.15 2009/01/27 22:14:13 miod Exp $	*/
 
 /*
  * Copyright (c) 2006 Michael Shalayeff
@@ -1601,8 +1601,6 @@ pmap_page_remove_pae(struct vm_page *pg)
 		ptes = pmap_map_ptes_pae(pve->pv_pmap);	/* locks pmap */
 
 #ifdef DIAGNOSTIC
-		if (pve->pv_va >= uvm.pager_sva && pve->pv_va < uvm.pager_eva)
-			printf("pmap_page_remove: found pager VA on pv_list\n");
 		if (pve->pv_ptp && (PDE(pve->pv_pmap,
 		    pdei(pve->pv_va)) & PG_FRAME) !=
 		    VM_PAGE_TO_PHYS(pve->pv_ptp)) {
diff --git a/sys/arch/sparc/sparc/pmap.c b/sys/arch/sparc/sparc/pmap.c
index b800dacdce5..d3d495740c9 100644
--- a/sys/arch/sparc/sparc/pmap.c
+++ b/sys/arch/sparc/sparc/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.150 2008/10/23 23:54:02 tedu Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.151 2009/01/27 22:14:13 miod Exp $	*/
 /*	$NetBSD: pmap.c,v 1.118 1998/05/19 19:00:18 thorpej Exp $ */
 
 /*
@@ -1934,12 +1934,9 @@ pv_changepte4_4c(pv0, bis, bic)
 			/* in hardware: fix hardware copy */
 			if (CTX_USABLE(pm,rp)) {
 				/*
-				 * Bizarreness:  we never clear PG_W on
-				 * pager pages, nor PG_NC on DVMA pages.
+				 * Bizarreness: we never clear PG_NC on
+				 * DVMA pages.
 				 */
-				if (bic == PG_W &&
-				    va >= uvm.pager_sva && va < uvm.pager_eva)
-					continue;
 				if (bic == PG_NC &&
 				    va >= DVMA_BASE && va < DVMA_END)
 					continue;
@@ -2249,12 +2246,8 @@ pv_changepte4m(pv0, bis, bic)
 
 		if (pm->pm_ctx) {
 			/*
-			 * Bizarreness:  we never clear PG_W on
-			 * pager pages, nor set PG_C on DVMA pages.
+			 * Bizarreness:  we never set PG_C on DVMA pages.
 			 */
-			if ((bic & PPROT_WRITE) &&
-			    va >= uvm.pager_sva && va < uvm.pager_eva)
-				continue;
 			if ((bis & SRMMU_PG_C) &&
 			    va >= DVMA_BASE && va < DVMA_END)
 				continue;