From owner-p4-projects@FreeBSD.ORG  Tue Jun  8 00:35:06 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1681B16A4D1; Tue,  8 Jun 2004 00:35:06 +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 E3E6616A4CE
	for <perforce@freebsd.org>; Tue,  8 Jun 2004 00:35:05 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DD2F543D5C
	for <perforce@freebsd.org>; Tue,  8 Jun 2004 00:35:05 +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 i580Z39L074929
	for <perforce@freebsd.org>; Tue, 8 Jun 2004 00:35:03 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i580Z368074926
	for perforce@freebsd.org; Tue, 8 Jun 2004 00:35:03 GMT
	(envelope-from peter@freebsd.org)
Date: Tue, 8 Jun 2004 00:35:03 GMT
Message-Id: <200406080035.i580Z368074926@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 54373 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 Jun 2004 00:35:06 -0000

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

Change 54373 by peter@peter_hammer on 2004/06/08 00:34:05

	IFC @54372

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#76 integrate
.. //depot/projects/hammer/sys/amd64/include/pmap.h#35 integrate

Differences ...

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

@@ -75,7 +75,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.462 2004/06/07 23:51:20 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.464 2004/06/08 00:29:41 peter Exp $");
 
 /*
  *	Manages physical address maps.
@@ -1850,7 +1850,7 @@
 	if (pmap == NULL)
 		return;
 
-	va &= (~(vm_paddr_t)PAGE_MASK);
+	va = trunc_page(va);
 #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 & (~(vm_paddr_t)PAGE_MASK);
+	base = trunc_page(va);
 	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#35 (text+ko) ====

@@ -39,7 +39,7 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.115 2004/05/16 20:44:41 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.116 2004/06/08 00:29:42 peter Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_