diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 18:22:57 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 18:31:41 +0100 |
| commit | 4fd69331ad227a4d8de26592d017b73e00caca9f (patch) | |
| tree | bfd95ed518ff0cb44318715432d321a92a7b9a0c /arch/x86/include/asm/efi.h | |
| parent | efi: Use NULL instead of 0 for pointer (diff) | |
| parent | x86, trace: Fix CR2 corruption when tracing page faults (diff) | |
| download | linux-4fd69331ad227a4d8de26592d017b73e00caca9f.tar.xz linux-4fd69331ad227a4d8de26592d017b73e00caca9f.zip | |
Merge remote-tracking branch 'tip/x86/urgent' into efi-for-mingo
Conflicts:
arch/x86/include/asm/efi.h
Diffstat (limited to 'arch/x86/include/asm/efi.h')
| -rw-r--r-- | arch/x86/include/asm/efi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h index e985d6bf7d3a..86d1fd4bf24c 100644 --- a/arch/x86/include/asm/efi.h +++ b/arch/x86/include/asm/efi.h @@ -135,6 +135,7 @@ extern void __init old_map_region(efi_memory_desc_t *md); extern void __init runtime_code_page_mkexec(void); extern void __init efi_runtime_mkexec(void); extern void __init efi_dump_pagetable(void); +extern void __init efi_apply_memmap_quirks(void); struct efi_setup_data { u64 fw_vendor; |