|
@@ -494,11 +494,13 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn)
|
|
|
int i;
|
|
|
|
|
|
nodes_clear(node_possible_map);
|
|
|
+ nodes_clear(node_online_map);
|
|
|
|
|
|
#ifdef CONFIG_NUMA_EMU
|
|
|
if (cmdline && !numa_emulation(start_pfn, end_pfn))
|
|
|
return;
|
|
|
nodes_clear(node_possible_map);
|
|
|
+ nodes_clear(node_online_map);
|
|
|
#endif
|
|
|
|
|
|
#ifdef CONFIG_ACPI_NUMA
|
|
@@ -506,6 +508,7 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn)
|
|
|
end_pfn << PAGE_SHIFT))
|
|
|
return;
|
|
|
nodes_clear(node_possible_map);
|
|
|
+ nodes_clear(node_online_map);
|
|
|
#endif
|
|
|
|
|
|
#ifdef CONFIG_K8_NUMA
|
|
@@ -513,6 +516,7 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn)
|
|
|
end_pfn<<PAGE_SHIFT))
|
|
|
return;
|
|
|
nodes_clear(node_possible_map);
|
|
|
+ nodes_clear(node_online_map);
|
|
|
#endif
|
|
|
printk(KERN_INFO "%s\n",
|
|
|
numa_off ? "NUMA turned off" : "No NUMA configuration found");
|
|
@@ -524,7 +528,6 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn)
|
|
|
memnode_shift = 63;
|
|
|
memnodemap = memnode.embedded_map;
|
|
|
memnodemap[0] = 0;
|
|
|
- nodes_clear(node_online_map);
|
|
|
node_set_online(0);
|
|
|
node_set(0, node_possible_map);
|
|
|
for (i = 0; i < NR_CPUS; i++)
|