[src/trunk]: src/sys/arch With Xen, PDPpaddr should contain a guest physical ...

[jym <jym%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3d4c5b0978dd
branches:  trunk
changeset: 756391:3d4c5b0978dd
user:      jym <jym%NetBSD.org@localhost>
date:      Thu Jul 15 23:20:34 2010 +0000

description:
With Xen, PDPpaddr should contain a guest physical address (== PFN).

diffstat:

 sys/arch/i386/i386/machdep.c |  8 ++++----
 sys/arch/xen/x86/x86_xpmap.c |  6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (57 lines):

diff -r 7dda3642089c -r 3d4c5b0978dd sys/arch/i386/i386/machdep.c
--- a/sys/arch/i386/i386/machdep.c      Thu Jul 15 22:19:19 2010 +0000
+++ b/sys/arch/i386/i386/machdep.c      Thu Jul 15 23:20:34 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.689 2010/07/15 22:19:19 jym Exp $        */
+/*     $NetBSD: machdep.c,v 1.690 2010/07/15 23:20:34 jym Exp $        */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.689 2010/07/15 22:19:19 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.690 2010/07/15 23:20:34 jym Exp $");
 
 #include "opt_beep.h"
 #include "opt_compat_ibcs2.h"
@@ -1303,9 +1303,9 @@
        cpu_init_msrs(&cpu_info_primary, true);
 
 #ifdef XEN
-       pcb->pcb_cr3 = PDPpaddr - KERNBASE;
+       pcb->pcb_cr3 = PDPpaddr;
        __PRINTK(("pcb_cr3 0x%lx cr3 0x%lx\n",
-           PDPpaddr - KERNBASE, xpmap_ptom(PDPpaddr - KERNBASE)));
+           PDPpaddr, xpmap_ptom(PDPpaddr)));
        XENPRINTK(("lwp0uarea %p first_avail %p\n",
            lwp0uarea, (void *)(long)first_avail));
        XENPRINTK(("ptdpaddr %p atdevbase %p\n", (void *)PDPpaddr,
diff -r 7dda3642089c -r 3d4c5b0978dd sys/arch/xen/x86/x86_xpmap.c
--- a/sys/arch/xen/x86/x86_xpmap.c      Thu Jul 15 22:19:19 2010 +0000
+++ b/sys/arch/xen/x86/x86_xpmap.c      Thu Jul 15 23:20:34 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: x86_xpmap.c,v 1.19 2010/02/26 19:25:07 jym Exp $       */
+/*     $NetBSD: x86_xpmap.c,v 1.20 2010/07/15 23:20:34 jym Exp $       */
 
 /*
  * Copyright (c) 2006 Mathieu Ropert <mro%adviseo.fr@localhost>
@@ -69,7 +69,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.19 2010/02/26 19:25:07 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.20 2010/07/15 23:20:34 jym Exp $");
 
 #include "opt_xen.h"
 #include "opt_ddb.h"
@@ -816,7 +816,7 @@
 #endif
 #ifdef __i386__
        /* Save phys. addr of PDP, for libkvm. */
-       PDPpaddr = (long)pde;
+       PDPpaddr = (long)pde - KERNBASE;
 #ifdef PAE
        /* also save the address of the L3 page */
        pmap_l3pd = pdtpe;