diff options
| author | Yalin Wang <Yalin.Wang@sonymobile.com> | 2014-09-26 03:07:09 +0100 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2016-09-13 13:23:05 +0200 |
| commit | 34add55c11c38c1bd3ea3527000c7d7254fe513d (patch) | |
| tree | a7c63b0d54923c72120c5cca683b318003905713 | |
| parent | b633749f421022838178b9efd5c98295376d01a3 (diff) | |
ARM: 8167/1: extend the reserved memory for initrd to be page aligned
This patch extends the start and end address of initrd to be page aligned,
so that we can free all memory including the un-page aligned head or tail
page of initrd, if the start or end address of initrd are not page
aligned, the page can't be freed by free_initrd_mem() function.
Signed-off-by: Yalin Wang <yalin.wang@sonymobile.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mm/init.c | 5 | ||||
| -rw-r--r-- | arch/arm64/mm/init.c | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index b0703c8e1..a0107adb7 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -766,6 +766,11 @@ static int keep_initrd; void free_initrd_mem(unsigned long start, unsigned long end) { if (!keep_initrd) { + if (start == initrd_start) + start = round_down(start, PAGE_SIZE); + if (end == initrd_end) + end = round_up(end, PAGE_SIZE); + poison_init_mem((void *)start, PAGE_ALIGN(end) - start); free_reserved_area(start, end, 0, "initrd"); } diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 665d7eed8..6480106b7 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -426,6 +426,11 @@ static int keep_initrd; void free_initrd_mem(unsigned long start, unsigned long end) { if (!keep_initrd) { + if (start == initrd_start) + start = round_down(start, PAGE_SIZE); + if (end == initrd_end) + end = round_up(end, PAGE_SIZE); + poison_init_mem((void *)start, PAGE_ALIGN(end) - start); free_reserved_area(start, end, 0, "initrd"); } |