From owner-p4-projects@FreeBSD.ORG  Tue Apr  8 11:44: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 2045237B405; Tue,  8 Apr 2003 11:44: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 A5EF337B401
	for <perforce@freebsd.org>; Tue,  8 Apr 2003 11:44:08 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3B8FD43F3F
	for <perforce@freebsd.org>; Tue,  8 Apr 2003 11:44: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 h38Ii80U072166
	for <perforce@freebsd.org>; Tue, 8 Apr 2003 11:44:08 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h38Ii7uM072163
	for perforce@freebsd.org; Tue, 8 Apr 2003 11:44:07 -0700 (PDT)
Date: Tue, 8 Apr 2003 11:44:07 -0700 (PDT)
Message-Id: <200304081844.h38Ii7uM072163@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 28537 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 18:44:10 -0000

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

Change 28537 by peter@peter_daintree on 2003/04/08 11:43:39

	untangle

Affected files ...

.. //depot/projects/hammer/sys/x86_64/include/pmap.h#16 edit

Differences ...

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

@@ -178,10 +178,10 @@
 {
 	vm_paddr_t pa;
 
-/* XXX the acronyms are giving me headaches at the moment */
-/* XXX	if ((pa = (vm_offset_t) PTD[va >> PDRSHIFT]) & PG_PS) {
+	pa = PTD[va >> PDRSHIFT];
+	if (pa & PG_PS) {
 		pa = (pa & ~(NBPDR - 1)) | (va & (NBPDR - 1));
-	} else */ {
+	} else {
 		pa = *vtopte(va);
 		pa = (pa & PG_FRAME) | (va & PAGE_MASK);
 	}