diff options
| author | Will Deacon <will.deacon@arm.com> | 2015-12-15 10:59:03 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-12-15 10:59:03 +0000 |
| commit | 129b985cc3f331d0e6908958f50757a3a1b37793 (patch) | |
| tree | 310de459f120ca99eaa30127a517212a16dccfd6 /arch/arm64/mm/mmu.c | |
| parent | 32d6397805d00573ce1fa55f408ce2bca15b0ad3 (diff) | |
| parent | f7d924894265794f447ea799dd853400749b5a22 (diff) | |
| download | op-kernel-dev-129b985cc3f331d0e6908958f50757a3a1b37793.zip op-kernel-dev-129b985cc3f331d0e6908958f50757a3a1b37793.tar.gz | |
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 c5bd5bc..58faeaa 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) { /* |
