From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Jan 2012 03:12:33 +0000 (-0800)
Subject: Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=bcede2f64a3b5cb50c0bdec1553ab480fd75d659;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'x86-efi-for-linus' of git://git./linux/kernel/git/tip/tip

* '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
---

bcede2f64a3b5cb50c0bdec1553ab480fd75d659
diff --cc arch/x86/include/asm/efi.h
index 7093e4a6a0bc,26d8c18d5faa..844f735fd63a
--- a/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);