ia64/xen-unstable

changeset 8574:08d2a74dce81

find changesets by author, revision, files, or words in the commit message
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@XenSource.com>
author Ian.Campbell@xensource.com
date Thu Jan 12 10:37:10 2006 +0000 (2006-01-12)
parents 1e1107e3d894
children 821368442403
files linux-2.6-xen-sparse/arch/xen/x86_64/kernel/entry.S linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/setup_arch_post.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/entry.S	Wed Jan 11 20:14:27 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/entry.S	Thu Jan 12 10:37:10 2006 +0000
     1.3 @@ -719,6 +719,7 @@ 11:	movb $0, EVENT_MASK(%rsp)
     1.4  	call evtchn_do_upcall
     1.5          jmp  error_exit
     1.6  
     1.7 +#ifdef CONFIG_X86_LOCAL_APIC
     1.8  ENTRY(nmi)
     1.9  	zeroentry do_nmi_callback
    1.10  ENTRY(do_nmi_callback)
    1.11 @@ -728,6 +729,7 @@ ENTRY(do_nmi_callback)
    1.12          XEN_BLOCK_EVENTS(%rsi)
    1.13          GET_THREAD_INFO(%rcx)
    1.14          jmp  retint_restore_args
    1.15 +#endif
    1.16  
    1.17          ALIGN
    1.18  restore_all_enable_events:  

     2.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/setup_arch_post.h	Wed Jan 11 20:14:27 2006 +0100
     2.2 +++ 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 +0000
     2.3 @@ -44,7 +44,9 @@ static void __init machine_specific_arch
     2.4                  (unsigned long) failsafe_callback,
     2.5                  (unsigned long) system_call);
     2.6  
     2.7 +#ifdef CONFIG_X86_LOCAL_APIC
     2.8  	HYPERVISOR_nmi_op(XENNMI_register_callback, (unsigned long)&nmi);
     2.9 +#endif
    2.10  
    2.11  	machine_specific_modify_cpu_capabilities(&boot_cpu_data);
    2.12  }