Merge tag 'v3.10.108' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / x86 / kernel / apic / apic.c

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 3cd8bfc3c4b69ef659a300fa2c6cbe34458fb46e..bc37ddeaa627a0091040305fa1d9ebb674e516da 100644 (file)
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1581,8 +1581,10 @@ void __init enable_IR_x2apic(void)
        int ret, x2apic_enabled = 0;
        int hardware_init_ret;
 
+#ifdef CONFIG_X86_IO_APIC
        if (skip_ioapic_setup)
                return;
+#endif
 
        /* Make sure irq_remap_ops are initialized */
        setup_irq_remapping_ops();