# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1190905302 21600
# Node ID 51f4a0e0b554b0aaeb177d3a48e21532fdf4da92
# Parent 65e336ea451f51cf68fa95dcea7dad1061878c9c
[IA64] Merge vmx_dispatch_itlb_miss and vmx_dispatch_dtlb_miss
They were identical.
Signed-off-by: Tristan Gingold <tgingold@xxxxxxx>
---
xen/arch/ia64/vmx/vmx_ivt.S | 30 ++++--------------------------
1 files changed, 4 insertions(+), 26 deletions(-)
diff -r 65e336ea451f -r 51f4a0e0b554 xen/arch/ia64/vmx/vmx_ivt.S
--- a/xen/arch/ia64/vmx/vmx_ivt.S Thu Sep 27 09:00:06 2007 -0600
+++ b/xen/arch/ia64/vmx/vmx_ivt.S Thu Sep 27 09:01:42 2007 -0600
@@ -217,7 +217,7 @@ vmx_itlb_loop:
;;
vmx_itlb_out:
mov r19 = 1
- br.sptk vmx_dispatch_itlb_miss
+ br.sptk vmx_dispatch_tlb_miss
VMX_FAULT(1);
END(vmx_itlb_miss)
@@ -298,7 +298,7 @@ vmx_dtlb_loop:
;;
vmx_dtlb_out:
mov r19 = 2
- br.sptk vmx_dispatch_dtlb_miss
+ br.sptk vmx_dispatch_tlb_miss
VMX_FAULT(2);
END(vmx_dtlb_miss)
@@ -1374,7 +1374,7 @@ GLOBAL_ENTRY(vmx_dispatch_vexirq)
br.call.sptk.many b6=vmx_vexirq
END(vmx_dispatch_vexirq)
-ENTRY(vmx_dispatch_itlb_miss)
+ENTRY(vmx_dispatch_tlb_miss)
VMX_SAVE_MIN_WITH_COVER_R19
alloc r14=ar.pfs,0,0,3,0
mov out0=cr.ifa
@@ -1393,29 +1393,7 @@ ENTRY(vmx_dispatch_itlb_miss)
;;
adds out2=16,r12
br.call.sptk.many b6=vmx_hpw_miss
-END(vmx_dispatch_itlb_miss)
-
-ENTRY(vmx_dispatch_dtlb_miss)
- VMX_SAVE_MIN_WITH_COVER_R19
- alloc r14=ar.pfs,0,0,3,0
- mov out0=cr.ifa
- mov out1=r15
- adds r3=8,r2 // set up second base pointer
- ;;
- ssm psr.ic
- ;;
- srlz.i // guarantee that interruption collection is on
- ;;
- (p15) ssm psr.i // restore psr.i
- movl r14=ia64_leave_hypervisor_prepare
- ;;
- VMX_SAVE_REST
- VMX_SAVE_EXTRA
- mov rp=r14
- ;;
- adds out2=16,r12
- br.call.sptk.many b6=vmx_hpw_miss
-END(vmx_dispatch_dtlb_miss)
+END(vmx_dispatch_tlb_miss)
ENTRY(vmx_dispatch_break_fault)
VMX_SAVE_MIN_WITH_COVER_R19
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home