diff options
author | Tejun Heo <tj@kernel.org> | 2011-01-23 08:37:31 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-01-28 08:54:05 -0500 |
commit | 6f802c4bfa2acf1bffa8341fe9084da0205d581d (patch) | |
tree | c5b7724f18c2470cd1132145e8bd6b681abdcfed /arch/x86/kernel/apic/apic.c | |
parent | 4c321ff8a01a95badf5d5403d80ca4e0ab07fce7 (diff) |
x86: Always use x86_cpu_to_logical_apicid for cpu -> logical apic id
Currently, cpu -> logical apic id translation is done by
apic->cpu_to_logical_apicid() callback which may or may not use
x86_cpu_to_logical_apicid. This is unnecessary as it should
always equal logical_smp_processor_id() which is known early
during CPU bring up.
Initialize x86_cpu_to_logical_apicid after apic->init_apic_ldr()
in setup_local_APIC() and always use x86_cpu_to_logical_apicid
for cpu -> logical apic id mapping.
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-6-git-send-email-tj@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic/apic.c')
-rw-r--r-- | arch/x86/kernel/apic/apic.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 126d5a3b00e9..ae08246f320c 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c | |||
@@ -1248,6 +1248,14 @@ void __cpuinit setup_local_APIC(void) | |||
1248 | */ | 1248 | */ |
1249 | apic->init_apic_ldr(); | 1249 | apic->init_apic_ldr(); |
1250 | 1250 | ||
1251 | #ifdef CONFIG_X86_32 | ||
1252 | /* | ||
1253 | * APIC LDR is initialized. Fetch and store logical_apic_id. | ||
1254 | */ | ||
1255 | early_per_cpu(x86_cpu_to_logical_apicid, cpu) = | ||
1256 | logical_smp_processor_id(); | ||
1257 | #endif | ||
1258 | |||
1251 | /* | 1259 | /* |
1252 | * Set Task Priority to 'accept all'. We never change this | 1260 | * Set Task Priority to 'accept all'. We never change this |
1253 | * later on. | 1261 | * later on. |