Commit 6c922cf7 authored by Miaohe Lin's avatar Miaohe Lin Committed by Linus Torvalds

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

Commit 108bcc96 ("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.comSigned-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 26011267
...@@ -493,20 +493,19 @@ static void update_pgdat_span(struct pglist_data *pgdat) ...@@ -493,20 +493,19 @@ static void update_pgdat_span(struct pglist_data *pgdat)
for (zone = pgdat->node_zones; for (zone = pgdat->node_zones;
zone < pgdat->node_zones + MAX_NR_ZONES; zone++) { zone < pgdat->node_zones + MAX_NR_ZONES; zone++) {
unsigned long zone_end_pfn = zone->zone_start_pfn + unsigned long end_pfn = zone_end_pfn(zone);
zone->spanned_pages;
/* No need to lock the zones, they can't change. */ /* No need to lock the zones, they can't change. */
if (!zone->spanned_pages) if (!zone->spanned_pages)
continue; continue;
if (!node_end_pfn) { if (!node_end_pfn) {
node_start_pfn = zone->zone_start_pfn; node_start_pfn = zone->zone_start_pfn;
node_end_pfn = zone_end_pfn; node_end_pfn = end_pfn;
continue; continue;
} }
if (zone_end_pfn > node_end_pfn) if (end_pfn > node_end_pfn)
node_end_pfn = zone_end_pfn; node_end_pfn = end_pfn;
if (zone->zone_start_pfn < node_start_pfn) if (zone->zone_start_pfn < node_start_pfn)
node_start_pfn = zone->zone_start_pfn; node_start_pfn = zone->zone_start_pfn;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment