[Xen-changelog] [xen-unstable] [IA64] #ifdef out unused mca_asm.S code

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID ac6f34b44e3f5a73119bf41e398ecdba3891db87
# Parent  7f4ec81761cfbf87724bbb4849fa9ff1e30d9fca
[IA64] #ifdef out unused mca_asm.S code

Make ia64_os_mca_dispatch spin

Signed-off-by: Akio Takebe <takebe_akio@xxxxxxxxxxxxxx>
[Changed from deleting code to #ifdef'ing it out]
Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
---
 xen/arch/ia64/linux-xen/mca_asm.S |   11 +++++++++++
 1 files changed, 11 insertions(+)

diff -r 7f4ec81761cf -r ac6f34b44e3f xen/arch/ia64/linux-xen/mca_asm.S
--- a/xen/arch/ia64/linux-xen/mca_asm.S Thu Jul 06 10:48:21 2006 -0600
+++ b/xen/arch/ia64/linux-xen/mca_asm.S Thu Jul 06 11:06:06 2006 -0600
@@ -59,6 +59,7 @@
        st8     [_tmp]=r17,0x08;;                       \
        st8     [_tmp]=r18,0x08
 
+#ifndef XEN
 /*
  * OS_MCA_TO_SAL_HANDOFF_STATE (SAL 3.0 spec)
  * (p6) is executed if we never entered virtual mode (TLB error)
@@ -106,15 +107,19 @@
        ;;                                                              \
        ld8 reg=[reg]
 
+#endif /* !XEN */
        .global ia64_os_mca_dispatch
        .global ia64_os_mca_dispatch_end
        .global ia64_sal_to_os_handoff_state
+#ifndef XEN
        .global ia64_os_to_sal_handoff_state
        .global ia64_do_tlb_purge
+#endif
 
        .text
        .align 16
 
+#ifndef XEN
 /*
  * Just the TLB purge part is moved to a separate function
  * so we can re-use the code for cpu hotplug code as well
@@ -856,6 +861,12 @@ end_os_mca_restore:
        br      ia64_os_mca_done_restore;;
 
 //EndStub//////////////////////////////////////////////////////////////////////
+#else
+ia64_os_mca_dispatch:
+1:
+       br.sptk 1b
+ia64_os_mca_dispatch_end:
+#endif /* !XEN */
 
 
 // ok, the issue here is that we need to save state information so

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog