Merge branch 'linus' into xen-64bit

1 files changed, 5 insertions, 0 deletions

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 2ed504b97d47..c9010f82141d 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