lkml.org 
[lkml]   [2008]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] x86: move init_cpu_to_node after get_smp_config
Date

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.
setup_per_cpu_data is already called before that.
we will get per_cpu_data on wrong node.

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>

---
arch/x86/kernel/setup.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

Index: linux-2.6/arch/x86/kernel/setup.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/setup.c
+++ linux-2.6/arch/x86/kernel/setup.c
@@ -780,10 +780,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:
@@ -792,6 +788,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();

\
 
 \ /
  Last update: 2008-07-03 10:31    [W:0.086 / U:0.160 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site