From: Chester Lin <clin@suse.com>
Date: Fri, 30 Aug 2019 13:30:07 +0000 (+0100)
Subject: ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary
X-Git-Tag: v5.4-rc1~79^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1d31999cf04c21709f72ceb17e65b54a401330da;p=platform%2Fkernel%2Flinux-rpi.git

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

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>
---

diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index d5e0b90..25da9b2 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -1197,6 +1197,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)
 				/*