diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2015-11-30 13:28:16 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-12-09 17:57:23 +0100 |
| commit | 68709f45385aeddb0ca96a060c0c8259944f321b (patch) | |
| tree | 124bde978b7b93f854e12e6c260d9e0d960b422c /arch/arm64/mm/init.c | |
| parent | mm/memblock: add MEMBLOCK_NOMAP attribute to memblock memory table (diff) | |
| download | linux-68709f45385aeddb0ca96a060c0c8259944f321b.tar.xz 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/init.c')
| -rw-r--r-- | arch/arm64/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 17bf39ac83ba..ac4d7cbbdd2d 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -120,7 +120,7 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) #ifdef CONFIG_HAVE_ARCH_PFN_VALID int pfn_valid(unsigned long pfn) { - return memblock_is_memory(pfn << PAGE_SHIFT); + return memblock_is_map_memory(pfn << PAGE_SHIFT); } EXPORT_SYMBOL(pfn_valid); #endif |