From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 16 Feb 2011 08:44:04 +0000 (+0100)
Subject: Merge branch 'x86/numa' into x86/mm
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=52b8b8d7251f8f7b8ed4a6c623618106d83e18b5;p=linux-beck.git

Merge branch 'x86/numa' into x86/mm

Merge reason: consolidate it into the more generic x86/mm tree to prevent conflicts.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

52b8b8d7251f8f7b8ed4a6c623618106d83e18b5
diff --cc arch/x86/mm/amdtopology_64.c
index 49b334cdd64c,c7fae38c4080..2523c3554de5
--- a/arch/x86/mm/amdtopology_64.c
+++ b/arch/x86/mm/amdtopology_64.c
@@@ -282,12 -284,8 +282,12 @@@ int __init amd_scan_nodes(void
  		memblock_x86_register_active_regions(i,
  				nodes[i].start >> PAGE_SHIFT,
  				nodes[i].end >> PAGE_SHIFT);
 +	init_memory_mapping_high();
 +	for_each_node_mask(i, node_possible_map) {
 +		int j;
 +
  		for (j = apicid_base; j < cores + apicid_base; j++)
- 			apicid_to_node[(i << bits) + j] = i;
+ 			set_apicid_to_node((i << bits) + j, i);
  		setup_node_bootmem(i, nodes[i].start, nodes[i].end);
  	}