[Xen-changelog] [xen-unstable] [IA64] use get_gpfn_from_mfn()

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID d5adbcbb7492bbdcd250065bcb5e96f68e23eeb6
# Parent  2f9878d01e2bac1b4c825d13973d63fa7138986e
[IA64] use get_gpfn_from_mfn()

clean up vmx_vcpu_tpa() and mfn_to_gmfn(). don't access mpt_table directly.
use get_gpfn_from_mfn()

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 xen/arch/ia64/vmx/vmmu.c  |    2 +-
 xen/include/asm-ia64/mm.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -r 2f9878d01e2b -r d5adbcbb7492 xen/arch/ia64/vmx/vmmu.c
--- a/xen/arch/ia64/vmx/vmmu.c  Fri Jun 09 10:35:39 2006 -0600
+++ b/xen/arch/ia64/vmx/vmmu.c  Fri Jun 09 10:35:40 2006 -0600
@@ -637,7 +637,7 @@ IA64FAULT vmx_vcpu_tpa(VCPU *vcpu, UINT6
             dnat_page_consumption(vcpu, vadr);
             return IA64_FAULT;
         }else{
-            *padr = ((*(mpt_table+arch_to_xen_ppn(data->ppn)))<<PAGE_SHIFT) | 
(vadr&(PAGE_SIZE-1));
+            *padr = (get_gpfn_from_mfn(arch_to_xen_ppn(data->ppn)) << 
PAGE_SHIFT) | (vadr & (PAGE_SIZE - 1));
             return IA64_NO_FAULT;
         }
     }
diff -r 2f9878d01e2b -r d5adbcbb7492 xen/include/asm-ia64/mm.h
--- a/xen/include/asm-ia64/mm.h Fri Jun 09 10:35:39 2006 -0600
+++ b/xen/include/asm-ia64/mm.h Fri Jun 09 10:35:40 2006 -0600
@@ -460,7 +460,7 @@ extern u64 translate_domain_pte(u64 ptev
 */
 
 #define mfn_to_gmfn(_d, mfn)                   \
-    machine_to_phys_mapping[(mfn)]
+    get_gpfn_from_mfn(mfn)
 
 #define gmfn_to_mfn(_d, gpfn)                  \
     gmfn_to_mfn_foreign((_d), (gpfn))

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog