diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-03 10:46:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-03 10:46:41 -0400 |
| commit | a758379b031f50b9def094aad071ef547a5cb335 (patch) | |
| tree | 3a29fedfd77b578a568916ce4c3b6cf2750b8a77 /arch/arm64 | |
| parent | 14f97d9713283adfadf2193e287e21d079f72ee7 (diff) | |
| parent | 0ce3cc008ec04258b6a6314b09f1a6012810881a (diff) | |
| download | talos-op-linux-a758379b031f50b9def094aad071ef547a5cb335.tar.gz talos-op-linux-a758379b031f50b9def094aad071ef547a5cb335.zip | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI fixes from Ingo Molnar:
"Two EFI fixes: one for x86, one for ARM, fixing a boot crash bug that
can trigger under newer EFI firmware"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
arm64/efi: Fix boot crash by not padding between EFI_MEMORY_RUNTIME regions
x86/efi: Fix boot crash by mapping EFI memmap entries bottom-up at runtime, instead of top-down
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/kernel/efi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c index e8ca6eaedd02..13671a9cf016 100644 --- a/arch/arm64/kernel/efi.c +++ b/arch/arm64/kernel/efi.c @@ -258,7 +258,8 @@ static bool __init efi_virtmap_init(void) */ if (!is_normal_ram(md)) prot = __pgprot(PROT_DEVICE_nGnRE); - else if (md->type == EFI_RUNTIME_SERVICES_CODE) + else if (md->type == EFI_RUNTIME_SERVICES_CODE || + !PAGE_ALIGNED(md->phys_addr)) prot = PAGE_KERNEL_EXEC; else prot = PAGE_KERNEL; |
