From owner-p4-projects@FreeBSD.ORG  Sat Apr  5 03:15:36 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 16B9D37B404; Sat,  5 Apr 2003 03:15:36 -0800 (PST)
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 A7C9C37B401
	for <perforce@freebsd.org>; Sat,  5 Apr 2003 03:15:35 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4E37F43F3F
	for <perforce@freebsd.org>; Sat,  5 Apr 2003 03:15:35 -0800 (PST)
	(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 h35BFZ0U051099
	for <perforce@freebsd.org>; Sat, 5 Apr 2003 03:15:35 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35BFY31051096
	for perforce@freebsd.org; Sat, 5 Apr 2003 03:15:34 -0800 (PST)
Date: Sat, 5 Apr 2003 03:15:34 -0800 (PST)
Message-Id: <200304051115.h35BFY31051096@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 28218 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: Sat, 05 Apr 2003 11:15:37 -0000

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

Change 28218 by peter@peter_overcee on 2003/04/05 03:15:15

	temporarily use another symbol for the page table array

Affected files ...

.. //depot/projects/hammer/sys/x86_64/include/pmap.h#12 edit
.. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#24 edit
.. //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#15 edit
.. //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#15 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/include/pmap.h#12 (text+ko) ====

@@ -153,7 +153,7 @@
 extern pml4_entry_t	PML4[];
 extern pdp_entry_t	PDP[];
 extern pd_entry_t	PTD[];
-extern pd_entry_t	PML4pml4e[];
+extern pd_entry_t	PTDpde[];
 
 extern pml4_entry_t *IdlePML4;	/* physical address of "Idle" state directory */
 extern pdp_entry_t *IdlePDP;	/* physical address of "Idle" state directory */

==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#24 (text+ko) ====


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

@@ -538,7 +538,7 @@
 pmap_is_current(pmap_t pmap)
 {
 	return (pmap == kernel_pmap ||
-	    (pmap->pm_pdir[PTDPTDI] & PG_FRAME) == (PML4pml4e[0] & PG_FRAME));
+	    (pmap->pm_pdir[PTDPTDI] & PG_FRAME) == (PTDpde[0] & PG_FRAME));
 }
 
 /*

==== //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#15 (text+ko) ====

@@ -272,7 +272,7 @@
 	printf("Keyboard reset did not work, attempting CPU shutdown\n");
 	DELAY(1000000);	/* wait 1 sec for printf to complete */
 	/* force a shutdown by unmapping entire address space ! */
-	bzero((caddr_t)PML4, NBPML4T);
+	bzero((caddr_t)PTD, NBPTD);
 
 	/* "good night, sweet prince .... <THUNK!>" */
 	invltlb();