|
@@ -690,9 +690,7 @@ static void __init parse_drconf_memory(struct device_node *memory)
|
|
node_set_online(nid);
|
|
node_set_online(nid);
|
|
sz = numa_enforce_memory_limit(base, size);
|
|
sz = numa_enforce_memory_limit(base, size);
|
|
if (sz)
|
|
if (sz)
|
|
- add_active_range(nid, base >> PAGE_SHIFT,
|
|
|
|
- (base >> PAGE_SHIFT)
|
|
|
|
- + (sz >> PAGE_SHIFT));
|
|
|
|
|
|
+ memblock_set_node(base, sz, nid);
|
|
} while (--ranges);
|
|
} while (--ranges);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -782,8 +780,7 @@ new_range:
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
|
|
- add_active_range(nid, start >> PAGE_SHIFT,
|
|
|
|
- (start >> PAGE_SHIFT) + (size >> PAGE_SHIFT));
|
|
|
|
|
|
+ memblock_set_node(start, size, nid);
|
|
|
|
|
|
if (--ranges)
|
|
if (--ranges)
|
|
goto new_range;
|
|
goto new_range;
|
|
@@ -819,7 +816,8 @@ static void __init setup_nonnuma(void)
|
|
end_pfn = memblock_region_memory_end_pfn(reg);
|
|
end_pfn = memblock_region_memory_end_pfn(reg);
|
|
|
|
|
|
fake_numa_create_new_node(end_pfn, &nid);
|
|
fake_numa_create_new_node(end_pfn, &nid);
|
|
- add_active_range(nid, start_pfn, end_pfn);
|
|
|
|
|
|
+ memblock_set_node(PFN_PHYS(start_pfn),
|
|
|
|
+ PFN_PHYS(end_pfn - start_pfn), nid);
|
|
node_set_online(nid);
|
|
node_set_online(nid);
|
|
}
|
|
}
|
|
}
|
|
}
|