diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-03-04 15:49:59 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-03-04 15:50:06 -0800 |
| commit | 3c0b566334c9942c89927bd1b5ad2f32baab81fa (patch) | |
| tree | 2dac7217b98b7aa3f13f8213932f678e7b4fede7 /arch/x86/kernel | |
| parent | 0414855fdc4a40da05221fc6062cccbc0c30f169 (diff) | |
| parent | a5d90c923bcfb9632d998ed06e9569216ad695f3 (diff) | |
Merge tag 'efi-urgent' into x86/urgent
* Disable the new EFI 1:1 virtual mapping for SGI UV because using it
causes a crash during boot - Borislav Petkov
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel')
| -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 06853e67035..ce72964b2f4 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 } |