1.1 --- a/xen/arch/ia64/vmx/optvfault.S	Thu Dec 07 05:34:07 2006 -0700
     1.2 +++ b/xen/arch/ia64/vmx/optvfault.S	Thu Dec 07 05:36:30 2006 -0700
     1.3 @@ -209,7 +209,10 @@ GLOBAL_ENTRY(vmx_asm_rsm)
     1.4      dep.z r28=4,61,3
     1.5      ;;
     1.6      mov rr[r0]=r26
     1.7 +    ;;
     1.8      mov rr[r28]=r27
     1.9 +    ;;
    1.10 +    srlz.d
    1.11      br.many vmx_resume_to_guest
    1.12  END(vmx_asm_rsm)
    1.13  
    1.14 @@ -260,9 +263,10 @@ GLOBAL_ENTRY(vmx_asm_ssm)
    1.15      dep.z r28=4,61,3
    1.16      ;;
    1.17      mov rr[r0]=r26
    1.18 +    ;;
    1.19      mov rr[r28]=r27
    1.20      ;;
    1.21 -    srlz.i
    1.22 +    srlz.d
    1.23      ;;
    1.24  vmx_asm_ssm_1:
    1.25      tbit.nz p6,p0=r29,IA64_PSR_I_BIT
    1.26 @@ -341,9 +345,10 @@ vmx_asm_mov_to_psr_back:
    1.27      dep.z r28=4,61,3
    1.28      ;;
    1.29      mov rr[r0]=r26
    1.30 +    ;;
    1.31      mov rr[r28]=r27
    1.32      ;;
    1.33 -    srlz.i
    1.34 +    srlz.d
    1.35      ;;
    1.36  vmx_asm_mov_to_psr_1:
    1.37      mov r20=cr.ipsr