diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-20 16:56:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-20 16:56:56 +0200 |
| commit | 7597cdc066313bfd211cca2f9252dfeb41271391 (patch) | |
| tree | ffd1212804b82844b17e7708c75c4972a6415977 /arch/x86/platform | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| parent | x86/efi: Only map RAM into EFI page tables if in mixed-mode (diff) | |
| download | linux-7597cdc066313bfd211cca2f9252dfeb41271391.tar.xz linux-7597cdc066313bfd211cca2f9252dfeb41271391.zip | |
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into efi/urgent
Pull EFI fixes from Matt Fleming:
* Fix a boot hang on large memory machines (multiple terabyte) caused
by type conversion errors in the x86 PAT code (Matt Fleming)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/platform')
| -rw-r--r-- | arch/x86/platform/efi/efi_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c index 677e29e29473..8dd3784eb075 100644 --- a/arch/x86/platform/efi/efi_64.c +++ b/arch/x86/platform/efi/efi_64.c @@ -245,7 +245,7 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages) * text and allocate a new stack because we can't rely on the * stack pointer being < 4GB. */ - if (!IS_ENABLED(CONFIG_EFI_MIXED)) + if (!IS_ENABLED(CONFIG_EFI_MIXED) || efi_is_native()) return 0; /* |