ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary

commit 1d31999cf04c21709f72ceb17e65b54a401330da upstream.

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@suse.com>
Reviewed-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 70e560cf8ca03dfff5a02b0726d8be9644c87f87..d8cbe772f6901bd4eab5edc0ae20960b85dc5b67 100644 (file)
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -1195,6 +1195,9 @@ void __init adjust_lowmem_bounds(void)
                phys_addr_t block_start = reg->base;
                phys_addr_t block_end = reg->base + reg->size;
 
+               if (memblock_is_nomap(reg))
+                       continue;
+
                if (reg->base < vmalloc_limit) {
                        if (block_end > lowmem_limit)
                                /*