Merge branch 'linus' into x86/x2apic

1 files changed, 13 insertions, 0 deletions

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 2e78a143dec3..6121ffd46b9e 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -684,6 +684,11 @@ void __init setup_arch(char **cmdline_p)
                 clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);
         }
 
+#ifdef CONFIG_PCI
+        if (pci_early_dump_regs)
+                early_dump_pci_devices();
+#endif
+
         finish_e820_parsing();
 
 #ifdef CONFIG_X86_32
@@ -851,6 +856,14 @@ void __init setup_arch(char **cmdline_p)
         init_cpu_to_node();
 #endif
 
+#ifdef CONFIG_X86_NUMAQ
+        /*
+         * need to check online nodes num, call it
+         * here before time_init/tsc_init
+         */
+        numaq_tsc_disable();
+#endif
+
         init_apic_mappings();
         ioapic_init_mappings();