From b2cf10ee86d762e460df73a823de24c62f702ecd Mon Sep 17 00:00:00 2001 From: Greg Hackmann Date: Wed, 5 Sep 2018 09:39:22 -0700 Subject: ANDROID: arm64: mm: fix 4.4.154 merge android-4.4 contains an out-of-tree backport of 68709f45385a ("arm64: only consider memblocks with NOMAP cleared for linear mapping"), so it should use the 4.9.y implementation of pfn_valid() that calls memblock_is_map_memory(). Change-Id: Id1d67813ee2a0a85ec69ef255daa27c4f6286800 Reported-by: Nathan Chancellor Signed-off-by: Greg Hackmann --- arch/arm64/mm/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm64/mm/init.c') diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 17393bad19eb..60e113a7c5db 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -134,7 +134,7 @@ int pfn_valid(unsigned long pfn) if ((addr >> PAGE_SHIFT) != pfn) return 0; - return memblock_is_memory(addr); + return memblock_is_map_memory(addr); } EXPORT_SYMBOL(pfn_valid); #endif -- cgit v1.2.3