svn commit: r248718 - projects/amd64_xen_pv/sys/amd64/xen

[Cherry G. Mathew]

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];