diff options
| author | Mark Brown <broonie@kernel.org> | 2018-09-06 10:40:13 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-09-06 10:40:13 +0100 |
| commit | 82eacc8a7bb8eb5809ef9ad8fae8104110626305 (patch) | |
| tree | d507c4402d79f6b6e7841ae9a15612307cb0f049 /arch/arm64/mm | |
| parent | 3a9cbd70c74f3a4afc78f898f7f95519ef5c5477 (diff) | |
| parent | 4d9339a1f0e6e288903d34020f2378d250ea3cac (diff) | |
Merge tag 'v4.4.154' into linux-linaro-lsk-v4.4
This is the 4.4.154 stable release
Diffstat (limited to 'arch/arm64/mm')
| -rw-r--r-- | arch/arm64/mm/init.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index d9fb6d80ce0a..e9c38be1b00e 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -268,7 +268,11 @@ 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); + phys_addr_t addr = pfn << PAGE_SHIFT; + + if ((addr >> PAGE_SHIFT) != pfn) + return 0; + return memblock_is_memory(addr); } EXPORT_SYMBOL(pfn_valid); #endif |