ia64/xen-unstable

changeset 15900:51f4a0e0b554

[IA64] Merge vmx_dispatch_itlb_miss and vmx_dispatch_dtlb_miss

They were identical.

Signed-off-by: Tristan Gingold <tgingold@free.fr>
author Alex Williamson <alex.williamson@hp.com>
date Thu Sep 27 09:01:42 2007 -0600 (2007-09-27)
parents 65e336ea451f
children b658296982ee
files xen/arch/ia64/vmx/vmx_ivt.S
line diff
     1.1 --- a/xen/arch/ia64/vmx/vmx_ivt.S	Thu Sep 27 09:00:06 2007 -0600
     1.2 +++ b/xen/arch/ia64/vmx/vmx_ivt.S	Thu Sep 27 09:01:42 2007 -0600
     1.3 @@ -217,7 +217,7 @@ vmx_itlb_loop:
     1.4      ;;
     1.5  vmx_itlb_out:
     1.6      mov r19 = 1
     1.7 -    br.sptk vmx_dispatch_itlb_miss
     1.8 +    br.sptk vmx_dispatch_tlb_miss
     1.9      VMX_FAULT(1);
    1.10  END(vmx_itlb_miss)
    1.11  
    1.12 @@ -298,7 +298,7 @@ vmx_dtlb_loop:
    1.13      ;;
    1.14  vmx_dtlb_out:
    1.15      mov r19 = 2
    1.16 -    br.sptk vmx_dispatch_dtlb_miss
    1.17 +    br.sptk vmx_dispatch_tlb_miss
    1.18      VMX_FAULT(2);
    1.19  END(vmx_dtlb_miss)
    1.20  
    1.21 @@ -1374,7 +1374,7 @@ GLOBAL_ENTRY(vmx_dispatch_vexirq)
    1.22      br.call.sptk.many b6=vmx_vexirq
    1.23  END(vmx_dispatch_vexirq)
    1.24  
    1.25 -ENTRY(vmx_dispatch_itlb_miss)
    1.26 +ENTRY(vmx_dispatch_tlb_miss)
    1.27      VMX_SAVE_MIN_WITH_COVER_R19
    1.28      alloc r14=ar.pfs,0,0,3,0
    1.29      mov out0=cr.ifa
    1.30 @@ -1393,29 +1393,7 @@ ENTRY(vmx_dispatch_itlb_miss)
    1.31      ;;
    1.32      adds out2=16,r12
    1.33      br.call.sptk.many b6=vmx_hpw_miss
    1.34 -END(vmx_dispatch_itlb_miss)
    1.35 -
    1.36 -ENTRY(vmx_dispatch_dtlb_miss)
    1.37 -    VMX_SAVE_MIN_WITH_COVER_R19
    1.38 -    alloc r14=ar.pfs,0,0,3,0
    1.39 -    mov out0=cr.ifa
    1.40 -    mov out1=r15
    1.41 -    adds r3=8,r2                // set up second base pointer
    1.42 -    ;;
    1.43 -    ssm psr.ic
    1.44 -    ;;
    1.45 -    srlz.i                  // guarantee that interruption collection is on
    1.46 -    ;;
    1.47 -    (p15) ssm psr.i               // restore psr.i
    1.48 -    movl r14=ia64_leave_hypervisor_prepare
    1.49 -    ;;
    1.50 -    VMX_SAVE_REST
    1.51 -    VMX_SAVE_EXTRA
    1.52 -    mov rp=r14
    1.53 -    ;;
    1.54 -    adds out2=16,r12
    1.55 -    br.call.sptk.many b6=vmx_hpw_miss
    1.56 -END(vmx_dispatch_dtlb_miss)
    1.57 +END(vmx_dispatch_tlb_miss)
    1.58  
    1.59  ENTRY(vmx_dispatch_break_fault)
    1.60      VMX_SAVE_MIN_WITH_COVER_R19