From 5ce8d3bcef0208a641fe21ac5afac8bc858440eb Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Wed, 16 Feb 2011 12:13:06 +0100 Subject: [PATCH] --- yaml --- r: 234847 b: refs/heads/master c: 7d36b7bc9022f35f95cd85cdf441846298e8f9fb h: refs/heads/master i: 234845: c3e2d329b0cf82d7fc065f67de5ec58a2deaa393 234843: cdb5a67c153fe64ed52ccb43997781e1050b0af0 234839: 0611525090efde12583f330f301e2f3fa706d115 234831: 9606a375a599ac0d09b10863f352e6c4f277c1e2 234815: be73b143a6b91047bc46be6ac47adf1b02be89ab v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/numa_64.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a4c148b7cd83..2023f21f1271 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 275a88d3cf0e2f08a98dc5ce9494af0cb6ed2092 +refs/heads/master: 7d36b7bc9022f35f95cd85cdf441846298e8f9fb diff --git a/trunk/arch/x86/mm/numa_64.c b/trunk/arch/x86/mm/numa_64.c index 43ad3273561a..b7d78d7a2473 100644 --- a/trunk/arch/x86/mm/numa_64.c +++ b/trunk/arch/x86/mm/numa_64.c @@ -624,11 +624,12 @@ void __init initmem_init(unsigned long start_pfn, unsigned long last_pfn, memnodemap[0] = 0; node_set_online(0); node_set(0, node_possible_map); - for (i = 0; i < nr_cpu_ids; i++) - numa_set_node(i, 0); + for (i = 0; i < MAX_LOCAL_APIC; i++) + set_apicid_to_node(i, NUMA_NO_NODE); memblock_x86_register_active_regions(0, start_pfn, last_pfn); init_memory_mapping_high(); setup_node_bootmem(0, start_pfn << PAGE_SHIFT, last_pfn << PAGE_SHIFT); + numa_init_array(); } unsigned long __init numa_free_all_bootmem(void)