From owner-svn-src-projects@FreeBSD.ORG  Tue Mar 26 05:25:44 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 07FF7574;
 Tue, 26 Mar 2013 05:25:44 +0000 (UTC)
 (envelope-from cherry@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EF4B3AD0;
 Tue, 26 Mar 2013 05:25:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2Q5Ph9e020453;
 Tue, 26 Mar 2013 05:25:43 GMT (envelope-from cherry@svn.freebsd.org)
Received: (from cherry@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2Q5Phkx020452;
 Tue, 26 Mar 2013 05:25:43 GMT (envelope-from cherry@svn.freebsd.org)
Message-Id: <201303260525.r2Q5Phkx020452@svn.freebsd.org>
From: "Cherry G. Mathew" <cherry@FreeBSD.org>
Date: Tue, 26 Mar 2013 05:25:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r248718 - projects/amd64_xen_pv/sys/amd64/xen
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Mar 2013 05:25:44 -0000

Author: cherry
Date: Tue Mar 26 05:25:43 2013
New Revision: 248718
URL: http://svnweb.freebsd.org/changeset/base/248718

Log:
  Oops, missed out supporting bits for r248703:
        - store machine address in pcb->pcb_cr3. This prevents AS
          reloads within kernel space.
  
  Approved by: gibbs(implicit)

Modified:
  projects/amd64_xen_pv/sys/amd64/xen/machdep.c

Modified: projects/amd64_xen_pv/sys/amd64/xen/machdep.c
==============================================================================
--- projects/amd64_xen_pv/sys/amd64/xen/machdep.c	Tue Mar 26 04:56:54 2013	(r248717)
+++ projects/amd64_xen_pv/sys/amd64/xen/machdep.c	Tue Mar 26 05:25:43 2013	(r248718)
@@ -559,7 +559,7 @@ initxen(struct start_info *si)
 
 	/* setup proc 0's pcb */
 	thread0.td_pcb->pcb_flags = 0;
-	thread0.td_pcb->pcb_cr3 = VTOP(KPML4phys);
+	thread0.td_pcb->pcb_cr3 = xpmap_ptom(VTOP(KPML4phys));
 	thread0.td_frame = &proc0_tf;
 
         env = getenv("kernelname");
@@ -1295,6 +1295,12 @@ xen_set_proc(struct pcb *newpcb)
 }
 
 char *console_page;
+
+/* 
+ * We don't use the tss on xen pv - this is a dummy to not break
+ * common assembler code - see cpu_switch.S:cpu_switch
+ */
+
 #include <machine/tss.h>
 struct amd64tss common_tss[MAXCPU];