Merge branch 'x86/urgent' into x86/apic

[cascardo/linux.git] / arch / x86 / kernel / apic / apic.c

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 2dc01c3..46bb299 100644 (file)
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1624,6 +1624,9 @@ void __init enable_IR_x2apic(void)
        unsigned long flags;
        int ret, ir_stat;
 
+       if (skip_ioapic_setup)
+               return;
+
        ir_stat = irq_remapping_prepare();
        if (ir_stat < 0 && !x2apic_supported())
                return;
@@ -2168,6 +2171,8 @@ int __generic_processor_info(int apicid, int version, bool enabled)
                return -ENOSPC;
        }
 
+       num_processors++;
+
        /*
         * Validate version
         */