Commit 5f4765f9 authored Jul 02, 2008 by Yinghai Lu Committed by Ingo Molnar Jul 08, 2008

x86: move init_cpu_to_node after get_smp_config



when acpi=off, cpu_to_apicid is ready after get_smp_config
so need to move init_cpu_to_node after it.

otherwise, we will get wrong cpu->node mapping, and it will rely on
amd_detect_cmp() to correct it - but that is too late as
setup_per_cpu_data is already called before that so  we will get
per_cpu_data on the wrong node.

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent cb95a13a

arch/x86/kernel/setup.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -810,10 +810,6 @@ void __init setup_arch(char **cmdline_p)
		*/
		acpi_boot_init();

		#ifdef CONFIG_X86_64
		init_cpu_to_node();
		#endif

		#if defined(CONFIG_X86_MPPARSE) \|\| defined(CONFIG_X86_VISWS)
		/*
		* get boot-time SMP configuration:
		@@ -822,6 +818,10 @@ void __init setup_arch(char **cmdline_p)
		get_smp_config();
		#endif

		#ifdef CONFIG_X86_64
		init_cpu_to_node();
		#endif

		init_apic_mappings();
		ioapic_init_mappings();