summaryrefslogtreecommitdiff
path: root/arch/arm64/mm
diff options
context:
space:
mode:
authorRong Qianfeng <rongqianfeng@vivo.com>2024-09-02 05:39:35 +0300
committerWill Deacon <will@kernel.org>2024-09-04 18:26:26 +0300
commit1db9716d44875d31acf29255710e82338560c177 (patch)
treeff015848c75c335daf461d4bf61dc61f39483b4e /arch/arm64/mm
parent7c626ce4bae1ac14f60076d00eafe71af30450ba (diff)
downloadlinux-1db9716d44875d31acf29255710e82338560c177.tar.xz
arm64/mm: Delete __init region from memblock.reserved
If CONFIG_ARCH_KEEP_MEMBLOCK is enabled, the memory information in memblock will be retained. We release the __init memory here, and we should also delete the corresponding region in memblock.reserved, which allows debugfs/memblock/reserved to display correct memory information. Signed-off-by: Rong Qianfeng <rongqianfeng@vivo.com> Link: https://lore.kernel.org/r/20240902023940.43227-1-rongqianfeng@vivo.com Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/mm')
-rw-r--r--arch/arm64/mm/init.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 9b5ab6818f7f..aea834a9691a 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -414,6 +414,12 @@ void __init mem_init(void)
void free_initmem(void)
{
+ unsigned long aligned_begin = ALIGN_DOWN((u64)__init_begin, PAGE_SIZE);
+ unsigned long aligned_end = ALIGN((u64)__init_end, PAGE_SIZE);
+
+ /* Delete __init region from memblock.reserved. */
+ memblock_free((void *)aligned_begin, aligned_end - aligned_begin);
+
free_reserved_area(lm_alias(__init_begin),
lm_alias(__init_end),
POISON_FREE_INITMEM, "unused kernel");