| Message ID | 20220614092156.1972846-5-mawupeng1@huawei.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | introduce mirrored memory support for arm64 | expand |
On Tue, Jun 14, 2022 at 05:21:55PM +0800, Wupeng Ma wrote: > From: Ma Wupeng <mawupeng1@huawei.com> > > Commit 177e15f0c144 ("arm64: add the initrd region to the linear mapping explicitly") > remove all the flags of the memory used by initrd. This is fine since > MEMBLOCK_MIRROR is not used in arm64. > > However with mirrored feature introduced to arm64, this will clear the mirrored > flag used by initrd, which will lead to error log printed by > find_zone_movable_pfns_for_nodes() if the lower 4G range has some non-mirrored > memory. > > To solve this problem, only MEMBLOCK_NOMAP flag will be removed via > memblock_clear_nomap(). > > Signed-off-by: Ma Wupeng <mawupeng1@huawei.com> > Reviewed-by: Ard Biesheuvel <ardb@kernel.org> Acked-by: Catalin Marinas <catalin.marinas@arm.com>
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 339ee84e5a61..8456dbae9441 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -350,8 +350,8 @@ void __init arm64_memblock_init(void) "initrd not fully accessible via the linear mapping -- please check your bootloader ...\n")) { phys_initrd_size = 0; } else { - memblock_remove(base, size); /* clear MEMBLOCK_ flags */ memblock_add(base, size); + memblock_clear_nomap(base, size); memblock_reserve(base, size); } }