]> git.baikalelectronics.ru Git - kernel.git/commit
arm64: partially revert "ARM: 8167/1: extend the reserved memory for initrd to be...
authorCatalin Marinas <catalin.marinas@arm.com>
Fri, 16 Jan 2015 13:56:38 +0000 (13:56 +0000)
committerWill Deacon <will.deacon@arm.com>
Fri, 16 Jan 2015 13:57:33 +0000 (13:57 +0000)
commitcbca2e6bd12c47295062c6bd912a61b311390877
tree196c3c624f432c0e4f31153c6d6f8b7c38ed3077
parentcb79c007645918ed0df696a1944a83e63fd9797d
arm64: partially revert "ARM: 8167/1: extend the reserved memory for initrd to be page aligned"

This patch partially reverts commit a2d4c1d11ab1df88b18eb0f3613b9a96b8a09e7f
(only the arm64 part). There is no guarantee that the boot-loader places other
images like dtb in a different page than initrd start/end, especially when the
kernel is built with 64KB pages. When this happens, such pages must not be
freed. The free_reserved_area() already takes care of rounding up "start" and
rounding down "end" to avoid freeing partially used pages.

Cc: <stable@vger.kernel.org> # 3.17+
Reported-by: Peter Maydell <Peter.Maydell@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
arch/arm64/mm/init.c