diff options
| author | Will Deacon | 2015-12-15 11:59:03 +0100 |
|---|---|---|
| committer | Will Deacon | 2015-12-15 11:59:03 +0100 |
| commit | 129b985cc3f331d0e6908958f50757a3a1b37793 (patch) | |
| tree | 310de459f120ca99eaa30127a517212a16dccfd6 /arch/arm64/mm/mmu.c | |
| parent | arm64: mm: ensure that the zero page is visible to the page table walker (diff) | |
| parent | arm64/efi: refactor EFI init and runtime code for reuse by 32-bit ARM (diff) | |
| download | kernel-qcow2-linux-129b985cc3f331d0e6908958f50757a3a1b37793.tar.gz kernel-qcow2-linux-129b985cc3f331d0e6908958f50757a3a1b37793.tar.xz kernel-qcow2-linux-129b985cc3f331d0e6908958f50757a3a1b37793.zip | |
Merge branch 'aarch64/efi' into aarch64/for-next/core
Merge in EFI memblock changes from Ard, which form the preparatory work
for UEFI support on 32-bit ARM.
Diffstat (limited to 'arch/arm64/mm/mmu.c')
| -rw-r--r-- | arch/arm64/mm/mmu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index c5bd5bca8e3d..58faeaa7fbdc 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -380,6 +380,8 @@ static void __init map_mem(void) if (start >= end) break; + if (memblock_is_nomap(reg)) + continue; if (ARM64_SWAPPER_USES_SECTION_MAPS) { /* |