summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm64/mm/init.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index aea834a9691a..a0400b9aa814 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -414,14 +414,16 @@ 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);
+ void *lm_init_begin = lm_alias(__init_begin);
+ void *lm_init_end = lm_alias(__init_end);
+
+ WARN_ON(!IS_ALIGNED((unsigned long)lm_init_begin, PAGE_SIZE));
+ WARN_ON(!IS_ALIGNED((unsigned long)lm_init_end, PAGE_SIZE));
/* Delete __init region from memblock.reserved. */
- memblock_free((void *)aligned_begin, aligned_end - aligned_begin);
+ memblock_free(lm_init_begin, lm_init_end - lm_init_begin);
- free_reserved_area(lm_alias(__init_begin),
- lm_alias(__init_end),
+ free_reserved_area(lm_init_begin, lm_init_end,
POISON_FREE_INITMEM, "unused kernel");
/*
* Unmap the __init region but leave the VM area in place. This