[Xen-changelog] [xen-unstable] [IA64] Fix a bug in vmx_vcpu_pta

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

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID adfc9aa684f922cf62aa11aa7ff8c10c9812d259
# Parent  db6dce7ae3740f6bc7aa002159511cde5a321725
[IA64] Fix a bug in vmx_vcpu_pta

Signed-off-by: Anthony Xu <anthony.xu@xxxxxxxxx>
---
 xen/arch/ia64/vmx/vmmu.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -r db6dce7ae374 -r adfc9aa684f9 xen/arch/ia64/vmx/vmmu.c
--- a/xen/arch/ia64/vmx/vmmu.c  Wed Jun 14 16:05:42 2006 -0600
+++ b/xen/arch/ia64/vmx/vmmu.c  Wed Jun 14 16:05:43 2006 -0600
@@ -612,7 +612,8 @@ IA64FAULT vmx_vcpu_tpa(VCPU *vcpu, UINT6
             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;
         }
     }

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