From: awilliam@xenbuild.aw <awilliam@xenbuild.aw>
Date: Wed, 14 Jun 2006 22:05:43 +0000 (-0600)
Subject: [IA64] Fix a bug in vmx_vcpu_pta
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15967
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4b6684a083c949ffe05f8417b80b1f6eb8d8c8f8;p=xen.git

[IA64] Fix a bug in vmx_vcpu_pta

Signed-off-by: Anthony Xu <anthony.xu@intel.com>
---

diff --git a/xen/arch/ia64/vmx/vmmu.c b/xen/arch/ia64/vmx/vmmu.c
index 3df28d1afd..c6ec77f1e4 100644
--- a/xen/arch/ia64/vmx/vmmu.c
+++ b/xen/arch/ia64/vmx/vmmu.c
@@ -612,7 +612,8 @@ IA64FAULT vmx_vcpu_tpa(VCPU *vcpu, UINT64 vadr, UINT64 *padr)
             dnat_page_consumption(vcpu, vadr);
             return IA64_FAULT;
         }else{
-            *padr = (data->ppn<<12) | (vadr&(PSIZE(data->ps)-1));
+            *padr = ((data->ppn >> (data->ps - 12)) << data->ps) |
+                                                (vadr & (PSIZE(data->ps) - 1));
             return IA64_NO_FAULT;
         }
     }