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>
2011-02-16 09:44:04 +01:00
parent 02ac81a812 14392fd329
commit 52b8b8d725
34 changed files with 504 additions and 488 deletions
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -1047,9 +1047,7 @@ void __init setup_arch(char **cmdline_p)

 	prefill_possible_map();

-#ifdef CONFIG_X86_64
 	init_cpu_to_node();
-#endif

 	init_apic_mappings();
 	ioapic_and_gsi_init();