aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/efi.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-10-26 10:17:38 +0200
committerIngo Molnar <mingo@kernel.org>2012-10-26 10:17:38 +0200
commit8b724e2a12d553cad8ad412846511c783a92d25e (patch)
treea07e14802a768a7156f70e2f9550ff98fe2b17f1 /arch/x86/include/asm/efi.h
parentf82f64dd9f485e13f29f369772d4a0e868e5633a (diff)
parent5189c2a7c7769ee9d037d76c1a7b8550ccf3481c (diff)
downloadvexpress-lsk-8b724e2a12d553cad8ad412846511c783a92d25e.tar.gz
Merge tag 'efi-for-3.7' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'arch/x86/include/asm/efi.h')
-rw-r--r--arch/x86/include/asm/efi.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
index 36ff332da13..6e8fdf5ad11 100644
--- a/arch/x86/include/asm/efi.h
+++ b/arch/x86/include/asm/efi.h
@@ -98,6 +98,7 @@ extern void efi_set_executable(efi_memory_desc_t *md, bool executable);
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