diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2015-10-01 17:58:11 +0200 |
|---|---|---|
| committer | ard <ard.biesheuvel@linaro.org> | 2015-12-13 19:18:29 +0100 |
| commit | 09414d00a137cf7f42b6dc7415f346258d60e8da (patch) | |
| tree | 2c437a5bc7e4248a9eb9c92c796ba76d8f7f1266 /arch | |
| parent | c7936206b9715d7a3075b53789c1fed0cab9147f (diff) | |
| download | linux-stable-09414d00a137cf7f42b6dc7415f346258d60e8da.tar.gz linux-stable-09414d00a137cf7f42b6dc7415f346258d60e8da.tar.bz2 linux-stable-09414d00a137cf7f42b6dc7415f346258d60e8da.zip | |
ARM: 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.
Tested-by: Ryan Harkin <ryan.harkin@linaro.org>
Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mm/init.c | 5 | ||||
| -rw-r--r-- | arch/arm/mm/mmu.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 8a63b4cdc0f2..16104b1e2661 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -191,7 +191,7 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max_low, #ifdef CONFIG_HAVE_ARCH_PFN_VALID int pfn_valid(unsigned long pfn) { - return memblock_is_memory(__pfn_to_phys(pfn)); + return memblock_is_map_memory(__pfn_to_phys(pfn)); } EXPORT_SYMBOL(pfn_valid); #endif @@ -432,6 +432,9 @@ static void __init free_highpages(void) if (end <= max_low) continue; + if (memblock_is_nomap(mem)) + continue; + /* Truncate partial highmem entries */ if (start < max_low) start = max_low; diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 8c69830e791a..c615d2eb9232 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -1435,6 +1435,9 @@ static void __init map_lowmem(void) phys_addr_t end = start + reg->size; struct map_desc map; + if (memblock_is_nomap(reg)) + continue; + if (end > arm_lowmem_limit) end = arm_lowmem_limit; if (start >= end) |