Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, efi: Break up large initrd reads
  x86, efi: EFI boot stub support
  efi: Add EFI file I/O data types
  efi.h: Add boottime->locate_handle search types
  efi.h: Add graphics protocol guids
  efi.h: Add allocation types for boottime->allocate_pages()
  efi.h: Add efi_image_loaded_t
  efi.h: Add struct definition for boot time services
  x86: Don't use magic strings for EFI loader signature
  x86: Add missing bzImage fields to struct setup_header

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/efi.h
index 7093e4a6a0bc6dd5644b2b14cbef9ef5f4085eef,26d8c18d5faa046b42253be74e798f64f4157e7a..844f735fd63aa5763804e51710b7ed45ddf10e76
--- 1/arch/x86/include/asm/efi.h
--- 2/arch/x86/include/asm/efi.h
+++ b/arch/x86/include/asm/efi.h
@@@ -33,10 -35,10 +35,12 @@@ extern unsigned long asmlinkage efi_cal
  #define efi_call_virt6(f, a1, a2, a3, a4, a5, a6)     \
        efi_call_virt(f, a1, a2, a3, a4, a5, a6)
  
 +#define efi_ioremap(addr, size, type)         ioremap_cache(addr, size)
 +
  #else /* !CONFIG_X86_32 */
  
+ #define EFI_LOADER_SIGNATURE  "EL64"
+ 
  extern u64 efi_call0(void *fp);
  extern u64 efi_call1(void *fp, u64 arg1);
  extern u64 efi_call2(void *fp, u64 arg1, u64 arg2);

diff --cc arch/x86/kernel/setup.c
Simple merge