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/kernel/setup.c | |
| 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/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 3b5d278b7d5b..fa511acff7e6 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -1239,14 +1239,8 @@ void __init setup_arch(char **cmdline_p) register_refined_jiffies(CLOCK_TICK_RATE); #ifdef CONFIG_EFI - /* Once setup is done above, unmap the EFI memory map on - * mismatched firmware/kernel archtectures since there is no - * support for runtime services. - */ - if (efi_enabled(EFI_BOOT) && !efi_is_native()) { - pr_info("efi: Setup done, disabling due to 32/64-bit mismatch\n"); - efi_unmap_memmap(); - } + if (efi_enabled(EFI_BOOT)) + efi_apply_memmap_quirks(); #endif } |