diff options
| author | Greg Hackmann <ghackmann@google.com> | 2018-09-05 09:39:22 -0700 |
|---|---|---|
| committer | Greg Hackmann <ghackmann@google.com> | 2018-09-05 09:43:00 -0700 |
| commit | b2cf10ee86d762e460df73a823de24c62f702ecd (patch) | |
| tree | 92a9a0a176d6f49a3a40b91035c01d737a53dde9 | |
| parent | d762e28031e9b01584231acc3ef1c12822ca3fb6 (diff) | |
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 <natechancellor@gmail.com>
Signed-off-by: Greg Hackmann <ghackmann@google.com>
| -rw-r--r-- | arch/arm64/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |