[Xen-changelog] Fix x86_64 domU build by conditionalizing NMI support on CONFIG_X86_LOCAL_APIC

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

# HG changeset patch
# User Ian.Campbell@xxxxxxxxxxxxx
# Node ID 08d2a74dce81b7d7d29ae5753d7539e2c837afd4
# Parent  1e1107e3d894f0d5b844639bfc5edc145b81df6b
Fix x86_64 domU build by conditionalizing NMI support on CONFIG_X86_LOCAL_APIC

The NMI handler is not built unless CONFIG_X86_LOCAL_APIC is defined, and 
CONFIG_X86_LOCAL_APIC requires a dom0 build.

Signed-off-by: Ian Campbell <Ian.Campbell@xxxxxxxxxxxxx>

diff -r 1e1107e3d894 -r 08d2a74dce81 
linux-2.6-xen-sparse/arch/xen/x86_64/kernel/entry.S
--- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/entry.S       Wed Jan 11 
19:14:27 2006
+++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/entry.S       Thu Jan 12 
10:37:10 2006
@@ -719,6 +719,7 @@
        call evtchn_do_upcall
         jmp  error_exit
 
+#ifdef CONFIG_X86_LOCAL_APIC
 ENTRY(nmi)
        zeroentry do_nmi_callback
 ENTRY(do_nmi_callback)
@@ -728,6 +729,7 @@
         XEN_BLOCK_EVENTS(%rsi)
         GET_THREAD_INFO(%rcx)
         jmp  retint_restore_args
+#endif
 
         ALIGN
 restore_all_enable_events:  
diff -r 1e1107e3d894 -r 08d2a74dce81 
linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/setup_arch_post.h
--- 
a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/setup_arch_post.h    
    Wed Jan 11 19:14:27 2006
+++ 
b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/setup_arch_post.h    
    Thu Jan 12 10:37:10 2006
@@ -44,7 +44,9 @@
                 (unsigned long) failsafe_callback,
                 (unsigned long) system_call);
 
+#ifdef CONFIG_X86_LOCAL_APIC
        HYPERVISOR_nmi_op(XENNMI_register_callback, (unsigned long)&nmi);
+#endif
 
        machine_specific_modify_cpu_capabilities(&boot_cpu_data);
 }

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