diff options
author | Tejun Heo <tj@kernel.org> | 2011-01-23 08:37:30 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-01-28 08:54:05 -0500 |
commit | 4c321ff8a01a95badf5d5403d80ca4e0ab07fce7 (patch) | |
tree | 6fb9715b01c94988e20fa3ac2324c364854e6a79 /arch/x86/kernel/apic/es7000_32.c | |
parent | 1245e1668c6e52bee76a423f8fab3bfcdd6226ae (diff) |
x86: Replace cpu_2_logical_apicid[] with early percpu variable
Unlike x86_64, on x86_32, the mapping from cpu to logical apicid
may vary depending on apic in use. cpu_2_logical_apicid[] array
is used for this mapping. Replace it with early percpu variable
x86_cpu_to_logical_apicid to make it better aligned with other
mappings.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: eric.dumazet@gmail.com
Cc: yinghai@kernel.org
Cc: brgerst@gmail.com
Cc: gorcunov@gmail.com
Cc: penberg@kernel.org
Cc: shaohui.zheng@intel.com
Cc: rientjes@google.com
LKML-Reference: <1295789862-25482-5-git-send-email-tj@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic/es7000_32.c')
-rw-r--r-- | arch/x86/kernel/apic/es7000_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c index 8593582d8022..7cb73e12f784 100644 --- a/arch/x86/kernel/apic/es7000_32.c +++ b/arch/x86/kernel/apic/es7000_32.c | |||
@@ -534,7 +534,7 @@ static int es7000_cpu_to_logical_apicid(int cpu) | |||
534 | #ifdef CONFIG_SMP | 534 | #ifdef CONFIG_SMP |
535 | if (cpu >= nr_cpu_ids) | 535 | if (cpu >= nr_cpu_ids) |
536 | return BAD_APICID; | 536 | return BAD_APICID; |
537 | return cpu_2_logical_apicid[cpu]; | 537 | return early_per_cpu(x86_cpu_to_logical_apicid, cpu); |
538 | #else | 538 | #else |
539 | return logical_smp_processor_id(); | 539 | return logical_smp_processor_id(); |
540 | #endif | 540 | #endif |