From owner-p4-projects@FreeBSD.ORG  Tue Dec 25 06:40:49 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 22ADA16A41A; Tue, 25 Dec 2007 06:40:49 +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 8F45416A417
	for <perforce@freebsd.org>; Tue, 25 Dec 2007 06:40:48 +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 8C38713C458
	for <perforce@freebsd.org>; Tue, 25 Dec 2007 06:40:48 +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 lBP6emqb022569
	for <perforce@freebsd.org>; Tue, 25 Dec 2007 06:40:48 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBP6emQu022445
	for perforce@freebsd.org; Tue, 25 Dec 2007 06:40:48 GMT
	(envelope-from kmacy@freebsd.org)
Date: Tue, 25 Dec 2007 06:40:48 GMT
Message-Id: <200712250640.lBP6emQu022445@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 131567 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: Tue, 25 Dec 2007 06:40:49 -0000

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

Change 131567 by kmacy@pandemonium:kmacy:xen31 on 2007/12/25 06:39:51

	ifdef out temporarily pte_hi setting
	map IdlePTD at the right place in PTD

Affected files ...

.. //depot/projects/xen31/sys/i386/include/xen/hypercall.h#3 edit
.. //depot/projects/xen31/sys/i386/xen/xen_machdep.c#5 edit

Differences ...

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

@@ -224,7 +224,7 @@
 	unsigned long va, pte_t new_val, unsigned long flags)
 {
 	unsigned long pte_hi = 0;
-#ifdef PAE
+#if defined(PAE) && 0
 	pte_hi = new_val.pte_high;
 #endif
 	return _hypercall4(int, update_va_mapping, va,

==== //depot/projects/xen31/sys/i386/xen/xen_machdep.c#5 (text+ko) ====

@@ -831,7 +831,7 @@
 	/*
 	 *  Map IdlePTD at PTD
 	 */
-	pdir_shadow[2][508] = IdlePTDnewma | PG_V;
+	pdir_shadow[2][511] = IdlePTDnewma | PG_V;
 
 	for (i = 0; i < 4; i++)
 		PT_SET_MA(pdir_shadow[i], pdir_shadow_ma[i] | PG_V);