From owner-p4-projects@FreeBSD.ORG  Wed Jul 14 01:01:32 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 31DA916A4D0; Wed, 14 Jul 2004 01:01:32 +0000 (GMT)
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 06FBC16A4CE
	for <perforce@freebsd.org>; Wed, 14 Jul 2004 01:01:32 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F209343D49
	for <perforce@freebsd.org>; Wed, 14 Jul 2004 01:01:31 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6E11Vrj083933
	for <perforce@freebsd.org>; Wed, 14 Jul 2004 01:01:31 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6E11V86083930
	for perforce@freebsd.org; Wed, 14 Jul 2004 01:01:31 GMT
	(envelope-from peter@freebsd.org)
Date: Wed, 14 Jul 2004 01:01:31 GMT
Message-Id: <200407140101.i6E11V86083930@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 57308 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: Wed, 14 Jul 2004 01:01:32 -0000

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

Change 57308 by peter@peter_melody on 2004/07/14 01:01:11

	Fix vtopde().  Use PAGE_SHIFT/PDRSHIFT for clarity so that they
	can be compared to the pte_index/pde_index routines above.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#91 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#91 (text+ko) ====

@@ -356,7 +356,7 @@
 {
 	u_int64_t mask = ((1ul << (NPTEPGSHIFT + NPDEPGSHIFT + NPDPEPGSHIFT + NPML4EPGSHIFT)) - 1);
 
-	return (PTmap + (amd64_btop(va) & mask));
+	return (PTmap + ((va >> PAGE_SHIFT) & mask));
 }
 
 static __inline pd_entry_t *
@@ -364,7 +364,7 @@
 {
 	u_int64_t mask = ((1ul << (NPDEPGSHIFT + NPDPEPGSHIFT + NPML4EPGSHIFT)) - 1);
 
-	return (PTmap + (amd64_btop(va) & mask));
+	return (PDmap + ((va >> PDRSHIFT) & mask));
 }
 
 static u_int64_t