|
@@ -365,8 +365,7 @@ out_fail:
|
|
|
static void grow_pgdat_span(struct pglist_data *pgdat, unsigned long start_pfn,
|
|
|
unsigned long end_pfn)
|
|
|
{
|
|
|
- unsigned long old_pgdat_end_pfn =
|
|
|
- pgdat->node_start_pfn + pgdat->node_spanned_pages;
|
|
|
+ unsigned long old_pgdat_end_pfn = pgdat_end_pfn(pgdat);
|
|
|
|
|
|
if (!pgdat->node_spanned_pages || start_pfn < pgdat->node_start_pfn)
|
|
|
pgdat->node_start_pfn = start_pfn;
|
|
@@ -579,9 +578,9 @@ static void shrink_zone_span(struct zone *zone, unsigned long start_pfn,
|
|
|
static void shrink_pgdat_span(struct pglist_data *pgdat,
|
|
|
unsigned long start_pfn, unsigned long end_pfn)
|
|
|
{
|
|
|
- unsigned long pgdat_start_pfn = pgdat->node_start_pfn;
|
|
|
- unsigned long pgdat_end_pfn =
|
|
|
- pgdat->node_start_pfn + pgdat->node_spanned_pages;
|
|
|
+ unsigned long pgdat_start_pfn = pgdat->node_start_pfn;
|
|
|
+ unsigned long p = pgdat_end_pfn(pgdat); /* pgdat_end_pfn namespace clash */
|
|
|
+ unsigned long pgdat_end_pfn = p;
|
|
|
unsigned long pfn;
|
|
|
struct mem_section *ms;
|
|
|
int nid = pgdat->node_id;
|