diff options
| author | Greg Hackmann <ghackmann@google.com> | 2018-09-05 09:39:22 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2018-09-05 19:45:44 +0200 |
| commit | 676efbc954887ea35e34c68d59205740d887c594 (patch) | |
| tree | 269dd66adf7852172d3ac5473df55543d9f0261b | |
| parent | 34175ba3f5b985c4c03812f010b9f19b3606965c (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().
Reported-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@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 |