Merge branch 'devel-stable' into for-linus

[platform/kernel/linux-starfive.git] / arch / arm / mm / init.c

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 7f8cd1b..49bd081 100644 (file)
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -192,7 +192,7 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max_low,
 #ifdef CONFIG_HAVE_ARCH_PFN_VALID
 int pfn_valid(unsigned long pfn)
 {
-       return memblock_is_memory(__pfn_to_phys(pfn));
+       return memblock_is_map_memory(__pfn_to_phys(pfn));
 }
 EXPORT_SYMBOL(pfn_valid);
 #endif
@@ -433,6 +433,9 @@ static void __init free_highpages(void)
                if (end <= max_low)
                        continue;
 
+               if (memblock_is_nomap(mem))
+                       continue;
+
                /* Truncate partial highmem entries */
                if (start < max_low)
                        start = max_low;