Merge branches 'x86-asm-for-linus', 'x86-cleanups-for-linus', 'x86-cpu-for-linus...
[linux-3.10.git] / arch / x86 / kernel / setup.c
index 37ef116..9b4204e 100644 (file)
@@ -1011,7 +1011,8 @@ void __init setup_arch(char **cmdline_p)
        init_cpu_to_node();
 
        init_apic_mappings();
-       ioapic_and_gsi_init();
+       if (x86_io_apic_ops.init)
+               x86_io_apic_ops.init();
 
        kvm_guest_init();