From owner-p4-projects@FreeBSD.ORG  Mon Jun  7 22:46:15 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A175816A50B; Mon,  7 Jun 2004 22:46:15 +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 2E63516A4ED
	for <perforce@freebsd.org>; Mon,  7 Jun 2004 22:46:15 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 270B143D54
	for <perforce@freebsd.org>; Mon,  7 Jun 2004 22:46:15 +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 i57MkFdX050390
	for <perforce@freebsd.org>; Mon, 7 Jun 2004 22:46:15 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i57MkEoS050384
	for perforce@freebsd.org; Mon, 7 Jun 2004 22:46:14 GMT
	(envelope-from peter@freebsd.org)
Date: Mon, 7 Jun 2004 22:46:14 GMT
Message-Id: <200406072246.i57MkEoS050384@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 54361 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: Mon, 07 Jun 2004 22:46:16 -0000

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

Change 54361 by peter@peter_hammer on 2004/06/07 22:46:11

	make PG_NX stuff actually work.  PG_FRAME now has to exclude high
	order bits too, since the page frame number only goes up to bit 52.
	Switch a few things to using ~PAGE_MASK instead of PG_FRAME since
	thats what they really wanted.  Actually, they want trunc_page() etc,
	but thats for later.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#74 edit
.. //depot/projects/hammer/sys/amd64/include/pmap.h#34 edit

Differences ...

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

@@ -1850,7 +1850,7 @@
 	if (pmap == NULL)
 		return;
 
-	va &= PG_FRAME;
+	va &= (~(vm_paddr_t)PAGE_MASK);
 #ifdef PMAP_DIAGNOSTIC
 	if (va > VM_MAX_KERNEL_ADDRESS)
 		panic("pmap_enter: toobig");
@@ -2779,7 +2779,7 @@
 	/* If we gave a direct map region in pmap_mapdev, do nothing */
 	if (va >= DMAP_MIN_ADDRESS && va < DMAP_MAX_ADDRESS)
 		return;
-	base = va & PG_FRAME;
+	base = va & (~(vm_paddr_t)PAGE_MASK);
 	offset = va & PAGE_MASK;
 	size = roundup(offset + size, PAGE_SIZE);
 	for (tmpva = base; tmpva < (base + size); tmpva += PAGE_SIZE)

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

@@ -68,7 +68,7 @@
 /* Our various interpretations of the above */
 #define PG_W		PG_AVAIL1	/* "Wired" pseudoflag */
 #define	PG_MANAGED	PG_AVAIL2
-#define	PG_FRAME	(~((vm_paddr_t)PAGE_MASK))
+#define	PG_FRAME	(0x000ffffffffff000ul)
 #define	PG_PROT		(PG_RW|PG_U)	/* all protection bits . */
 #define PG_N		(PG_NC_PWT|PG_NC_PCD)	/* Non-cacheable */