Merge branch 'linus' into x86/urgent

Merge reason: we want to queue up a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --combined arch/x86/kernel/setup.c
index b9ca498f5602e5f22e88623abc6b69a2deae503a,a3e5948670c241eecb15028cefeae8209b37c669..afaf38447ef5fc42c53e78168492fa9eb89a032b
--- 1/arch/x86/kernel/setup.c
--- 2/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@@ -910,13 -910,6 +910,13 @@@ void __init setup_arch(char **cmdline_p
        memblock.current_limit = get_max_mapped();
        memblock_x86_fill();
  
 +      /*
 +       * The EFI specification says that boot service code won't be called
 +       * after ExitBootServices(). This is, in fact, a lie.
 +       */
 +      if (efi_enabled)
 +              efi_reserve_boot_services();
 +
        /* preallocate 4k for mptable mpc */
        early_reserve_e820_mpc_new();
  
@@@ -953,6 -946,8 +953,8 @@@
        if (init_ohci1394_dma_early)
                init_ohci1394_dma_on_all_controllers();
  #endif
+       /* Allocate bigger log buffer */
+       setup_log_buf(1);
  
        reserve_initrd();