From owner-p4-projects@FreeBSD.ORG  Tue Jan  1 06:35:03 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B175516A41A; Tue,  1 Jan 2008 06:35:03 +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 745B316A417
	for <perforce@freebsd.org>; Tue,  1 Jan 2008 06:35:03 +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 647F213C442
	for <perforce@freebsd.org>; Tue,  1 Jan 2008 06:35:03 +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 m016Z3QH017199
	for <perforce@freebsd.org>; Tue, 1 Jan 2008 06:35:03 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m016Z3PQ017196
	for perforce@freebsd.org; Tue, 1 Jan 2008 06:35:03 GMT
	(envelope-from kmacy@freebsd.org)
Date: Tue, 1 Jan 2008 06:35:03 GMT
Message-Id: <200801010635.m016Z3PQ017196@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 132230 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, 01 Jan 2008 06:35:04 -0000

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

Change 132230 by kmacy@pandemonium:kmacy:xen31 on 2008/01/01 06:34:15

	don't use inline assembly so long as we're maintaining a separate ptom mappping

Affected files ...

.. //depot/projects/xen31/sys/i386/include/cpufunc.h#5 edit

Differences ...

==== //depot/projects/xen31/sys/i386/include/cpufunc.h#5 (text+ko) ====

@@ -417,8 +417,15 @@
 static __inline void
 load_cr3(u_int data)
 {
-
+#ifdef XEN
+	xen_load_cr3(data);
+#else
+	/*
+	 * Xen will actually trap the cr3 load - but we need to
+	 * pass it a machine address
+	 */
 	__asm __volatile("movl %0,%%cr3" : : "r" (data) : "memory");
+#endif
 }
 
 static __inline u_int