ia64/xen-unstable

changeset 10379:adfc9aa684f9

[IA64] Fix a bug in vmx_vcpu_pta

Signed-off-by: Anthony Xu <anthony.xu@intel.com>
author awilliam@xenbuild.aw
date Wed Jun 14 16:05:43 2006 -0600 (2006-06-14)
parents db6dce7ae374
children d0a77e90eaa3
files xen/arch/ia64/vmx/vmmu.c
line diff
     1.1 --- a/xen/arch/ia64/vmx/vmmu.c	Wed Jun 14 16:05:42 2006 -0600
     1.2 +++ b/xen/arch/ia64/vmx/vmmu.c	Wed Jun 14 16:05:43 2006 -0600
     1.3 @@ -612,7 +612,8 @@ IA64FAULT vmx_vcpu_tpa(VCPU *vcpu, UINT6
     1.4              dnat_page_consumption(vcpu, vadr);
     1.5              return IA64_FAULT;
     1.6          }else{
     1.7 -            *padr = (data->ppn<<12) | (vadr&(PSIZE(data->ps)-1));
     1.8 +            *padr = ((data->ppn >> (data->ps - 12)) << data->ps) |
     1.9 +                                                (vadr & (PSIZE(data->ps) - 1));
    1.10              return IA64_NO_FAULT;
    1.11          }
    1.12      }