summaryrefslogtreecommitdiffstats
path: root/arch/arm64/mm/init.c
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2015-12-15 10:59:03 +0000
committerWill Deacon <will.deacon@arm.com>2015-12-15 10:59:03 +0000
commit129b985cc3f331d0e6908958f50757a3a1b37793 (patch)
tree310de459f120ca99eaa30127a517212a16dccfd6 /arch/arm64/mm/init.c
parent32d6397805d00573ce1fa55f408ce2bca15b0ad3 (diff)
parentf7d924894265794f447ea799dd853400749b5a22 (diff)
downloadop-kernel-dev-129b985cc3f331d0e6908958f50757a3a1b37793.zip
op-kernel-dev-129b985cc3f331d0e6908958f50757a3a1b37793.tar.gz
Merge branch 'aarch64/efi' into aarch64/for-next/core
Merge in EFI memblock changes from Ard, which form the preparatory work for UEFI support on 32-bit ARM.
Diffstat (limited to 'arch/arm64/mm/init.c')
-rw-r--r--arch/arm64/mm/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 2ee6c20..f3b061e 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -120,7 +120,7 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max)
#ifdef CONFIG_HAVE_ARCH_PFN_VALID
int pfn_valid(unsigned long pfn)
{
- return memblock_is_memory(pfn << PAGE_SHIFT);
+ return memblock_is_map_memory(pfn << PAGE_SHIFT);
}
EXPORT_SYMBOL(pfn_valid);
#endif
OpenPOWER on IntegriCloud