From: Chester Lin <clin@xxxxxxxx> [ Upstream commit 1d31999cf04c21709f72ceb17e65b54a401330da ] adjust_lowmem_bounds() checks every memblocks in order to find the boundary between lowmem and highmem. However some memblocks could be marked as NOMAP so they are not used by kernel, which should be skipped while calculating the boundary. Signed-off-by: Chester Lin <clin@xxxxxxxx> Reviewed-by: Mike Rapoport <rppt@xxxxxxxxxxxxx> Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxx> Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx> --- arch/arm/mm/mmu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index aead23f15213..d9ddb5721565 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -1121,6 +1121,9 @@ void __init sanity_check_meminfo(void) phys_addr_t block_end = reg->base + reg->size; phys_addr_t size_limit = reg->size; + if (memblock_is_nomap(reg)) + continue; + if (reg->base >= vmalloc_limit) highmem = 1; else -- 2.24.0
