From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 26 Oct 2012 08:17:38 +0000 (+0200)
Subject: Merge tag 'efi-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming... 
X-Git-Tag: firefly_0821_release~3680^2~1719^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8b724e2a12d553cad8ad412846511c783a92d25e;p=firefly-linux-kernel-4.4.55.git

Merge tag 'efi-for-3.7' of git://git./linux/kernel/git/mfleming/efi into x86/urgent

Pull EFI fixes from Matt Fleming:

 "Fix oops with EFI variables on mixed 32/64-bit firmware/kernels and
  document EFI git repository location on kernel.org."

Conflicts:
	arch/x86/include/asm/efi.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

8b724e2a12d553cad8ad412846511c783a92d25e
diff --cc arch/x86/include/asm/efi.h
index 36ff332da130,029189db84de..6e8fdf5ad113
--- a/arch/x86/include/asm/efi.h
+++ b/arch/x86/include/asm/efi.h
@@@ -98,7 -98,7 +98,8 @@@ extern void efi_set_executable(efi_memo
  extern int efi_memblock_x86_reserve_range(void);
  extern void efi_call_phys_prelog(void);
  extern void efi_call_phys_epilog(void);
+ extern void efi_unmap_memmap(void);
 +extern void efi_memory_uc(u64 addr, unsigned long size);
  
  #ifndef CONFIG_EFI
  /*