Merge branch 'x86/amd-nb' into x86/apic-cleanups
[~shefty/rdma-dev.git] / arch / x86 / kernel / setup.c
index df172c1e823850e846a97b306d326e375a25086a..0afb8c7e38038d0c7d63970129c2925af60dcd55 100644 (file)
@@ -1035,10 +1035,7 @@ void __init setup_arch(char **cmdline_p)
 #endif
 
        init_apic_mappings();
-       ioapic_init_mappings();
-
-       /* need to wait for io_apic is mapped */
-       probe_nr_irqs_gsi();
+       ioapic_and_gsi_init();
 
        kvm_guest_init();