ia64/xen-unstable

changeset 10678:ac6f34b44e3f

[IA64] #ifdef out unused mca_asm.S code

Make ia64_os_mca_dispatch spin

Signed-off-by: Akio Takebe <takebe_akio@jp.fujitsu.com>
[Changed from deleting code to #ifdef'ing it out]
Signed-off-by: Alex Williamson <alex.williamson@hp.com>
author awilliam@xenbuild.aw
date Thu Jul 06 11:06:06 2006 -0600 (2006-07-06)
parents 7f4ec81761cf
children 7c6c400f5a7d
files xen/arch/ia64/linux-xen/mca_asm.S
line diff
     1.1 --- a/xen/arch/ia64/linux-xen/mca_asm.S	Thu Jul 06 10:48:21 2006 -0600
     1.2 +++ b/xen/arch/ia64/linux-xen/mca_asm.S	Thu Jul 06 11:06:06 2006 -0600
     1.3 @@ -59,6 +59,7 @@
     1.4  	st8	[_tmp]=r17,0x08;;			\
     1.5  	st8	[_tmp]=r18,0x08
     1.6  
     1.7 +#ifndef XEN
     1.8  /*
     1.9   * OS_MCA_TO_SAL_HANDOFF_STATE (SAL 3.0 spec)
    1.10   * (p6) is executed if we never entered virtual mode (TLB error)
    1.11 @@ -106,15 +107,19 @@
    1.12  	;;								\
    1.13  	ld8 reg=[reg]
    1.14  
    1.15 +#endif /* !XEN */
    1.16  	.global ia64_os_mca_dispatch
    1.17  	.global ia64_os_mca_dispatch_end
    1.18  	.global ia64_sal_to_os_handoff_state
    1.19 +#ifndef XEN
    1.20  	.global	ia64_os_to_sal_handoff_state
    1.21  	.global ia64_do_tlb_purge
    1.22 +#endif
    1.23  
    1.24  	.text
    1.25  	.align 16
    1.26  
    1.27 +#ifndef XEN
    1.28  /*
    1.29   * Just the TLB purge part is moved to a separate function
    1.30   * so we can re-use the code for cpu hotplug code as well
    1.31 @@ -856,6 +861,12 @@ end_os_mca_restore:
    1.32  	br	ia64_os_mca_done_restore;;
    1.33  
    1.34  //EndStub//////////////////////////////////////////////////////////////////////
    1.35 +#else
    1.36 +ia64_os_mca_dispatch:
    1.37 +1:
    1.38 +	br.sptk 1b
    1.39 +ia64_os_mca_dispatch_end:
    1.40 +#endif /* !XEN */
    1.41  
    1.42  
    1.43  // ok, the issue here is that we need to save state information so