diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-25 05:13:15 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 11:10:37 (GMT) |
| commit | f47f9d538ecc938bed589e9d39ad7b454f3b506c (patch) | |
| tree | 8232bb36c7760457c4edc93603b3ecd6b264f574 | |
| parent | 232b957ae93973a5f8619ef61b916744b747478c (diff) | |
| download | linux-f47f9d538ecc938bed589e9d39ad7b454f3b506c.tar.xz | |
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.h | 2 | ||||
| -rw-r--r-- | include/asm-x86/mach-default/mach_apic.h | 4 |
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 8327907..017c8c1 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 21003b5..0b2cde5 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 |