mm/memory_hotplug: use helper function zone_end_pfn() to get end_pfn

Commit 108bcc96ef70 ("mm: add & use zone_end_pfn() and zone_spans_pfn()")
introduced the helper zone_end_pfn() to calculate the zone end pfn.  But
update_pgdat_span() forgot to use it.

Use this helper and rename local variable zone_end_pfn to end_pfn to avoid
a naming conflict with the existing zone_end_pfn().

Link: https://lkml.kernel.org/r/20210127093211.37714-1-linmiaohe@huawei.com
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 6a02c3f..a969463 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -493,20 +493,19 @@ static void update_pgdat_span(struct pglist_data *pgdat)
 
        for (zone = pgdat->node_zones;
             zone < pgdat->node_zones + MAX_NR_ZONES; zone++) {
-               unsigned long zone_end_pfn = zone->zone_start_pfn +
-                                            zone->spanned_pages;
+               unsigned long end_pfn = zone_end_pfn(zone);
 
                /* No need to lock the zones, they can't change. */
                if (!zone->spanned_pages)
                        continue;
                if (!node_end_pfn) {
                        node_start_pfn = zone->zone_start_pfn;
-                       node_end_pfn = zone_end_pfn;
+                       node_end_pfn = end_pfn;
                        continue;
                }
 
-               if (zone_end_pfn > node_end_pfn)
-                       node_end_pfn = zone_end_pfn;
+               if (end_pfn > node_end_pfn)
+                       node_end_pfn = end_pfn;
                if (zone->zone_start_pfn < node_start_pfn)
                        node_start_pfn = zone->zone_start_pfn;
        }