diff options
Diffstat (limited to 'arch/x86/mm')
-rw-r--r-- | arch/x86/mm/numa_64.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index 1aecc658cd7d..59898fb0a4aa 100644 --- a/arch/x86/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c | |||
@@ -494,11 +494,13 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn) | |||
494 | int i; | 494 | int i; |
495 | 495 | ||
496 | nodes_clear(node_possible_map); | 496 | nodes_clear(node_possible_map); |
497 | nodes_clear(node_online_map); | ||
497 | 498 | ||
498 | #ifdef CONFIG_NUMA_EMU | 499 | #ifdef CONFIG_NUMA_EMU |
499 | if (cmdline && !numa_emulation(start_pfn, end_pfn)) | 500 | if (cmdline && !numa_emulation(start_pfn, end_pfn)) |
500 | return; | 501 | return; |
501 | nodes_clear(node_possible_map); | 502 | nodes_clear(node_possible_map); |
503 | nodes_clear(node_online_map); | ||
502 | #endif | 504 | #endif |
503 | 505 | ||
504 | #ifdef CONFIG_ACPI_NUMA | 506 | #ifdef CONFIG_ACPI_NUMA |
@@ -506,6 +508,7 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn) | |||
506 | end_pfn << PAGE_SHIFT)) | 508 | end_pfn << PAGE_SHIFT)) |
507 | return; | 509 | return; |
508 | nodes_clear(node_possible_map); | 510 | nodes_clear(node_possible_map); |
511 | nodes_clear(node_online_map); | ||
509 | #endif | 512 | #endif |
510 | 513 | ||
511 | #ifdef CONFIG_K8_NUMA | 514 | #ifdef CONFIG_K8_NUMA |
@@ -513,6 +516,7 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn) | |||
513 | end_pfn<<PAGE_SHIFT)) | 516 | end_pfn<<PAGE_SHIFT)) |
514 | return; | 517 | return; |
515 | nodes_clear(node_possible_map); | 518 | nodes_clear(node_possible_map); |
519 | nodes_clear(node_online_map); | ||
516 | #endif | 520 | #endif |
517 | printk(KERN_INFO "%s\n", | 521 | printk(KERN_INFO "%s\n", |
518 | numa_off ? "NUMA turned off" : "No NUMA configuration found"); | 522 | 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) | |||
524 | memnode_shift = 63; | 528 | memnode_shift = 63; |
525 | memnodemap = memnode.embedded_map; | 529 | memnodemap = memnode.embedded_map; |
526 | memnodemap[0] = 0; | 530 | memnodemap[0] = 0; |
527 | nodes_clear(node_online_map); | ||
528 | node_set_online(0); | 531 | node_set_online(0); |
529 | node_set(0, node_possible_map); | 532 | node_set(0, node_possible_map); |
530 | for (i = 0; i < NR_CPUS; i++) | 533 | for (i = 0; i < NR_CPUS; i++) |