From 6100ed1d12475d1a73901ca9808300c683d4f415 Mon Sep 17 00:00:00 2001
From: David Greenman <dg@FreeBSD.org>
Date: Wed, 25 Jan 1995 22:06:23 +0000
Subject: [PATCH] Be a bit less fast and loose about setting non-cacheablity of
 pages.

---
 sys/amd64/amd64/pmap.c | 12 +-----------
 sys/i386/i386/pmap.c   | 12 +-----------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 5febdd0895b4..3b0c2bc5622d 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.42 1995/01/15 09:06:23 davidg Exp $
+ *	$Id: pmap.c,v 1.43 1995/01/24 09:56:32 davidg Exp $
  */
 
 /*
@@ -1192,7 +1192,6 @@ pmap_enter(pmap, va, pa, prot, wired)
 	register pt_entry_t *pte;
 	register pt_entry_t npte;
 	vm_offset_t opa;
-	int cacheable = 1;
 	int ptevalid = 0;
 
 	if (pmap == NULL)
@@ -1268,12 +1267,8 @@ pmap_enter(pmap, va, pa, prot, wired)
 			pv->pv_next = npv;
 		}
 		splx(s);
-		cacheable = 1;
-	} else {
-		cacheable = 0;
 	}
 
-
 	/*
 	 * Increment counters
 	 */
@@ -1286,11 +1281,6 @@ pmap_enter(pmap, va, pa, prot, wired)
 	 * Now validate mapping with desired protection/wiring.
 	 */
 	npte = (pt_entry_t) ((int) (pa | pte_prot(pmap, prot) | PG_V));
-	/*
-	 * for correctness:
-	 */
-	if (!cacheable)
-		(int) npte |= PG_N;
 
 	/*
 	 * When forking (copy-on-write, etc): A process will turn off write
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 5febdd0895b4..3b0c2bc5622d 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.42 1995/01/15 09:06:23 davidg Exp $
+ *	$Id: pmap.c,v 1.43 1995/01/24 09:56:32 davidg Exp $
  */
 
 /*
@@ -1192,7 +1192,6 @@ pmap_enter(pmap, va, pa, prot, wired)
 	register pt_entry_t *pte;
 	register pt_entry_t npte;
 	vm_offset_t opa;
-	int cacheable = 1;
 	int ptevalid = 0;
 
 	if (pmap == NULL)
@@ -1268,12 +1267,8 @@ pmap_enter(pmap, va, pa, prot, wired)
 			pv->pv_next = npv;
 		}
 		splx(s);
-		cacheable = 1;
-	} else {
-		cacheable = 0;
 	}
 
-
 	/*
 	 * Increment counters
 	 */
@@ -1286,11 +1281,6 @@ pmap_enter(pmap, va, pa, prot, wired)
 	 * Now validate mapping with desired protection/wiring.
 	 */
 	npte = (pt_entry_t) ((int) (pa | pte_prot(pmap, prot) | PG_V));
-	/*
-	 * for correctness:
-	 */
-	if (!cacheable)
-		(int) npte |= PG_N;
 
 	/*
 	 * When forking (copy-on-write, etc): A process will turn off write