| Message ID | 20191122105113.11213-1-lee.jones@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [4.4,1/9] ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary | expand |
On Fri, 22 Nov 2019, Lee Jones wrote: > From: Chester Lin <clin@suse.com> > > [ 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@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> > --- > arch/arm/mm/mmu.c | 3 +++ > 1 file changed, 3 insertions(+) Please don't apply this. > 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 -- Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
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