From owner-p4-projects@FreeBSD.ORG  Mon Apr  7 17:26:09 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 177F537B404; Mon,  7 Apr 2003 17:26:09 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AA5A537B401
	for <perforce@freebsd.org>; Mon,  7 Apr 2003 17:26:08 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 50ACB43FDD
	for <perforce@freebsd.org>; Mon,  7 Apr 2003 17:26:08 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h380Q80U057825
	for <perforce@freebsd.org>; Mon, 7 Apr 2003 17:26:08 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h380Q7d9057822
	for perforce@freebsd.org; Mon, 7 Apr 2003 17:26:07 -0700 (PDT)
Date: Mon, 7 Apr 2003 17:26:07 -0700 (PDT)
Message-Id: <200304080026.h380Q7d9057822@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 28466 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Apr 2003 00:26:10 -0000

http://perforce.freebsd.org/chv.cgi?CH=28466

Change 28466 by peter@peter_overcee on 2003/04/07 17:25:56

	update some 4MB page references to 2MB

Affected files ...

.. //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#17 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#17 (text+ko) ====

@@ -246,8 +246,8 @@
 
 /*
  * Move the kernel virtual free pointer to the next
- * 4MB.  This is used to help improve performance
- * by using a large (4MB) page for much of the kernel
+ * 2MB.  This is used to help improve performance
+ * by using a large (2MB) page for much of the kernel
  * (.text, .data, .bss)
  */
 static vm_offset_t
@@ -255,6 +255,9 @@
 {
 	vm_offset_t newaddr = addr;
 
+#if 0
+	newaddr = (addr + (NBPDR - 1)) & ~(NBPDR - 1);
+#endif
 	return newaddr;
 }
 
@@ -364,9 +367,11 @@
 	pgeflag = 0;
 	
 /*
- * Initialize the 4MB page size flag
+ * Initialize the 2MB page size flag
  */
-	pseflag = 0;
+#if 0
+	pseflag = PG_PS;
+#endif
 
 	invltlb();
 }
@@ -1185,7 +1190,7 @@
 	ptepa = (vm_offset_t) pmap->pm_pdir[ptepindex];
 
 	/*
-	 * This supports switching from a 4MB page to a
+	 * This supports switching from a 2MB page to a
 	 * normal 4K page.
 	 */
 	if (ptepa & PG_PS) {
@@ -1807,7 +1812,7 @@
 	opa = origpte & PG_FRAME;
 
 	if (origpte & PG_PS)
-		panic("pmap_enter: attempted pmap_enter on 4MB page");
+		panic("pmap_enter: attempted pmap_enter on 2MB page");
 
 	/*
 	 * Mapping has not changed, must be protection or wiring change.
@@ -1960,7 +1965,7 @@
 			 */
 			if (ptepa) {
 				if (ptepa & PG_PS)
-					panic("pmap_enter_quick: unexpected mapping into 4MB page");
+					panic("pmap_enter_quick: unexpected mapping into 2MB page");
 				if (pmap->pm_pteobj->root &&
 					(pmap->pm_pteobj->root->pindex == ptepindex)) {
 					mpte = pmap->pm_pteobj->root;