[Xen-changelog] [linux-2.6.18-xen] x86-64: fix build with newer binutils

[Xen patchbot-linux-2.6.18-xen <patchbot@xxxxxxx>]

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxx>
# Date 1387197486 -3600
# Node ID c27b59a05b12679b05fef74b56a7b19ca31e791b
# Parent  731ff1f10c46453a84345f678a97523619e706ab
x86-64: fix build with newer binutils

END() has to always be before switching back to an earlier section.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
---


diff -r 731ff1f10c46 -r c27b59a05b12 arch/x86_64/kernel/entry-xen.S
--- a/arch/x86_64/kernel/entry-xen.S    Fri Dec 13 10:31:50 2013 +0100
+++ b/arch/x86_64/kernel/entry-xen.S    Mon Dec 16 13:38:06 2013 +0100
@@ -939,26 +939,6 @@ 11:        incl %gs:pda_irqcount
        CFI_ENDPROC
 END(do_hypervisor_callback)
 
-#ifdef CONFIG_X86_LOCAL_APIC
-KPROBE_ENTRY(nmi)
-       zeroentry do_nmi_callback
-ENTRY(do_nmi_callback)
-       CFI_STARTPROC
-        addq $8, %rsp
-       CFI_ENDPROC
-       CFI_DEFAULT_STACK
-        call do_nmi
-        orl  $NMI_MASK,EFLAGS(%rsp)
-        RESTORE_REST
-        XEN_BLOCK_EVENTS(%rsi)
-       TRACE_IRQS_OFF
-        GET_THREAD_INFO(%rcx)
-        jmp  retint_restore_args
-       CFI_ENDPROC
-       .previous .text
-END(nmi)
-#endif
-
         ALIGN
 restore_all_enable_events:  
        CFI_DEFAULT_STACK adj=1
@@ -1168,20 +1148,25 @@ KPROBE_ENTRY(debug)
 END(debug)
        .previous .text
 
-#if 0
+#ifdef CONFIG_X86_LOCAL_APIC
        /* runs on exception stack */   
 KPROBE_ENTRY(nmi)
-       INTR_FRAME
-       pushq $-1
-       CFI_ADJUST_CFA_OFFSET 8
-       paranoidentry do_nmi, 0, 0
-#ifdef CONFIG_TRACE_IRQFLAGS
-       paranoidexit 0
-#else
-       jmp paranoid_exit1
-       CFI_ENDPROC
-#endif
+       zeroentry do_nmi_callback
 END(nmi)
+ENTRY(do_nmi_callback)
+       CFI_STARTPROC
+       addq $8,%rsp
+       CFI_ENDPROC
+       CFI_DEFAULT_STACK
+       call do_nmi
+       orl  $NMI_MASK,EFLAGS(%rsp)
+       RESTORE_REST
+       XEN_BLOCK_EVENTS(%rsi)
+       TRACE_IRQS_OFF
+       GET_THREAD_INFO(%rcx)
+       jmp  retint_restore_args
+       CFI_ENDPROC
+END(do_nmi_callback)
        .previous .text
 #endif        
 

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