Merge tag 'v3.14.49' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux...

[android-sdk/kernel-video.git] / arch / arm64 / mm / init.c

diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 3fb8d50dfdaa0737032ad9e37647332eab164b70..07982c1f714a4f26d57518cd6a0f39404aea43e0 100644 (file)
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -244,7 +244,7 @@ static void __init free_unused_memmap(void)
                 * memmap entries are valid from the bank end aligned to
                 * MAX_ORDER_NR_PAGES.
                 */
-               prev_end = ALIGN(start + __phys_to_pfn(reg->size),
+               prev_end = ALIGN(__phys_to_pfn(reg->base + reg->size),
                                 MAX_ORDER_NR_PAGES);
        }