x86, gart: fix gart detection for Fam11h CPUs

[safe/jmp/linux-2.6] / arch / x86 / kernel / setup.c

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 558ec26..0fa6790 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -561,7 +561,13 @@ static void __init reserve_standard_io_resources(void)
 
 }
 
-#ifdef CONFIG_PROC_VMCORE
+/*
+ * Note: elfcorehdr_addr is not just limited to vmcore. It is also used by
+ * is_kdump_kernel() to determine if we are booting after a panic. Hence
+ * ifdef it under CONFIG_CRASH_DUMP and not CONFIG_PROC_VMCORE.
+ */
+
+#ifdef CONFIG_CRASH_DUMP
 /* elfcorehdr= specifies the location of elf core header
  * stored by the crashed kernel. This option will be passed
  * by kexec loader to the capture kernel.
@@ -1069,17 +1075,15 @@ void __init setup_arch(char **cmdline_p)
        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();
 
+       /* need to wait for io_apic is mapped */
+       nr_irqs = probe_nr_irqs();
+
        kvm_guest_init();
 
        e820_reserve_resources();