| Message ID | 20191126134830.12747-1-lee.jones@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [4.19,1/5] ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary | expand |
Sorry, guys, copy/paste error. These 5 patches are headed for 4.14 NOT 4.19. On Tue, 26 Nov 2019, Lee Jones wrote: > From: Chester Lin <clin@suse.com> > > [ Upstream commit 59f200ef45852141dd45847563bf8e4c11a48f3f ] > > 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(+) > > diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c > index 70e560cf8ca0..d8cbe772f690 100644 > --- 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) > /* -- 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 70e560cf8ca0..d8cbe772f690 100644 --- 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) /*