x86/apic: Do not init irq remapping if ioapic is disabled

[pandora-kernel.git] / arch / x86 / kernel / apic / apic.c

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 838a3b4..8fcd92e 100644 (file)
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1481,6 +1481,9 @@ void __init enable_IR_x2apic(void)
        int ret, x2apic_enabled = 0;
        int dmar_table_init_ret;
 
+       if (skip_ioapic_setup)
+               return;
+
        dmar_table_init_ret = dmar_table_init();
        if (dmar_table_init_ret && !x2apic_supported())
                return;