aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-06-24 22:13:15 -0700
committerIngo Molnar <mingo@elte.hu>2008-07-08 13:10:37 +0200
commitf47f9d538ecc938bed589e9d39ad7b454f3b506c (patch)
tree8232bb36c7760457c4edc93603b3ecd6b264f574
parent232b957ae93973a5f8619ef61b916744b747478c (diff)
downloadmrst-s0i3-test-f47f9d538ecc938bed589e9d39ad7b454f3b506c.tar.gz
mrst-s0i3-test-f47f9d538ecc938bed589e9d39ad7b454f3b506c.tar.xz
mrst-s0i3-test-f47f9d538ecc938bed589e9d39ad7b454f3b506c.zip
x86: numa 32 using apicid_2_node to get node for logical_apicid
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--include/asm-x86/mach-bigsmp/mach_apic.h2
-rw-r--r--include/asm-x86/mach-default/mach_apic.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-x86/mach-bigsmp/mach_apic.h b/include/asm-x86/mach-bigsmp/mach_apic.h
index 8327907c79b..017c8c19ad8 100644
--- a/include/asm-x86/mach-bigsmp/mach_apic.h
+++ b/include/asm-x86/mach-bigsmp/mach_apic.h
@@ -81,7 +81,7 @@ static inline int multi_timer_check(int apic, int irq)
static inline int apicid_to_node(int logical_apicid)
{
- return (0);
+ return apicid_2_node[hard_smp_processor_id()];
}
static inline int cpu_present_to_apicid(int mps_cpu)
diff --git a/include/asm-x86/mach-default/mach_apic.h b/include/asm-x86/mach-default/mach_apic.h
index 21003b56ae9..0b2cde5e1b7 100644
--- a/include/asm-x86/mach-default/mach_apic.h
+++ b/include/asm-x86/mach-default/mach_apic.h
@@ -77,7 +77,11 @@ static inline void setup_apic_routing(void)
static inline int apicid_to_node(int logical_apicid)
{
+#ifdef CONFIG_SMP
+ return apicid_2_node[hard_smp_processor_id()];
+#else
return 0;
+#endif
}
#endif