From owner-p4-projects@FreeBSD.ORG  Wed Jan 23 21:20:53 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DCFDB16A46C; Wed, 23 Jan 2008 21:20:52 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A297916A417
	for <perforce@freebsd.org>; Wed, 23 Jan 2008 21:20:52 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9FBDA13C4DB
	for <perforce@freebsd.org>; Wed, 23 Jan 2008 21:20:52 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0NLKqfZ005658
	for <perforce@freebsd.org>; Wed, 23 Jan 2008 21:20:52 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0NLKqWu005655
	for perforce@freebsd.org; Wed, 23 Jan 2008 21:20:52 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 23 Jan 2008 21:20:52 GMT
Message-Id: <200801232120.m0NLKqWu005655@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 133946 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 23 Jan 2008 21:20:53 -0000

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

Change 133946 by kmacy@pandemonium:kmacy:xen31 on 2008/01/23 21:20:29

	mask off the upper bits so that PG_NX isn't accidentally treated as an index
	pointed out by alc

Affected files ...

.. //depot/projects/xen31/sys/i386/include/xen/xenpmap.h#9 edit

Differences ...

==== //depot/projects/xen31/sys/i386/include/xen/xenpmap.h#9 (text+ko) ====

@@ -202,13 +202,17 @@
 static __inline vm_paddr_t
 xpmap_mtop(vm_paddr_t mpa)
 {
-    return machtophys(mpa) | (mpa & PAGE_MASK);
+	vm_paddr_t tmp = (mpa & PG_FRAME);
+	
+	return machtophys(tmp) | (mpa & ~PG_FRAME);
 }
 
 static __inline vm_paddr_t
 xpmap_ptom(vm_paddr_t ppa)
 {
-    return phystomach(ppa) | (ppa & PAGE_MASK);
+	vm_paddr_t tmp = (ppa & PG_FRAME);
+
+	return phystomach(tmp) | (ppa & ~PG_FRAME);
 }
 
 static __inline void