Merge branch 'linus' into xen-64bit

diff --combined arch/x86/kernel/setup.c
index 2ed504b97d47ddd45d065954c3258f913f435b5a,531b55b8e81a1de1827eac5691d5f8aef1d8d10c..c9010f82141d93d16af0839838a3d18bb578d994
--- 1/arch/x86/kernel/setup.c
--- 2/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@@ -684,6 -684,11 +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
@@@ -819,10 -824,7 +824,10 @@@
        vmi_init();
  #endif
  
 +      paravirt_pagetable_setup_start(swapper_pg_dir);
        paging_init();
 +      paravirt_pagetable_setup_done(swapper_pg_dir);
 +      paravirt_post_allocator_init();
  
  #ifdef CONFIG_X86_64
        map_vsyscall();