diff options
| author | Ard Biesheuvel | 2015-11-30 13:28:16 +0100 |
|---|---|---|
| committer | Will Deacon | 2015-12-09 17:57:23 +0100 |
| commit | 68709f45385aeddb0ca96a060c0c8259944f321b (patch) | |
| tree | 124bde978b7b93f854e12e6c260d9e0d960b422c /arch/arm64/mm/mmu.c | |
| parent | mm/memblock: add MEMBLOCK_NOMAP attribute to memblock memory table (diff) | |
| download | kernel-qcow2-linux-68709f45385aeddb0ca96a060c0c8259944f321b.tar.gz kernel-qcow2-linux-68709f45385aeddb0ca96a060c0c8259944f321b.tar.xz kernel-qcow2-linux-68709f45385aeddb0ca96a060c0c8259944f321b.zip | |
arm64: only consider memblocks with NOMAP cleared for linear mapping
Take the new memblock attribute MEMBLOCK_NOMAP into account when
deciding whether a certain region is or should be covered by the
kernel direct mapping.
Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
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 873e363048c6..f336a775c353 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -372,6 +372,8 @@ static void __init map_mem(void) if (start >= end) break; + if (memblock_is_nomap(reg)) + continue; if (ARM64_SWAPPER_USES_SECTION_MAPS) { /* |