x86: use dyn_array in io_apic_xx.c

[deliverable/linux.git] / arch / x86 / kernel / setup.c

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 2255782e8d4b94664ff8c3c053af26aa114d0e6c..558ec26b08e25bdcb3ce22a3e98dda3262dbde20 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -1067,9 +1067,15 @@ void __init setup_arch(char **cmdline_p)
 #endif
 
        prefill_possible_map();
+
 #ifdef CONFIG_X86_64
+       /* need to wait for nr_cpu_ids settle down */
+       if (nr_irqs == NR_IRQS)
+               nr_irqs = 32 * nr_cpu_ids + 224;
        init_cpu_to_node();
 #endif
+       pin_map_size = nr_irqs * 2;
+       first_free_entry = nr_irqs;
 
        init_apic_mappings();
        ioapic_init_mappings();