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>

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/mm/amdtopology_64.c
index 49b334c,c7fae38..2523c35
--- 1/arch/x86/mm/amdtopology_64.c
--- 2/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);
        }
  

diff --cc arch/x86/mm/numa_64.c
Simple merge

diff --cc arch/x86/mm/srat_64.c
Simple merge