Commit-ID: df04cf011b0657ddc782b48d455f7e232b9be41c
Gitweb: http://git.kernel.org/tip/df04cf011b0657ddc782b48d455f7e232b9be41c
Author: Tejun Heo <tj@xxxxxxxxxx>
AuthorDate: Sun, 23 Jan 2011 14:37:37 +0100
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Fri, 28 Jan 2011 14:54:08 +0100
x86: Implement x86_32_early_logical_apicid() for numaq_32
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: eric.dumazet@xxxxxxxxx
Cc: yinghai@xxxxxxxxxx
Cc: brgerst@xxxxxxxxx
Cc: gorcunov@xxxxxxxxx
Cc: penberg@xxxxxxxxxx
Cc: shaohui.zheng@xxxxxxxxx
Cc: rientjes@xxxxxxxxxx
LKML-Reference: <1295789862-25482-12-git-send-email-tj@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
arch/x86/kernel/apic/es7000_32.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
index 0ffc1ec..5c53d05 100644
--- a/arch/x86/kernel/apic/es7000_32.c
+++ b/arch/x86/kernel/apic/es7000_32.c
@@ -460,6 +460,12 @@ static unsigned long es7000_check_apicid_present(int bit)
return physid_isset(bit, phys_cpu_present_map);
}
+static int es7000_early_logical_apicid(int cpu)
+{
+ /* on es7000, logical apicid is the same as physical */
+ return early_per_cpu(x86_bios_cpu_apicid, cpu);
+}
+
static unsigned long calculate_ldr(int cpu)
{
unsigned long id = per_cpu(x86_bios_cpu_apicid, cpu);
@@ -683,7 +689,7 @@ struct apic __refdata apic_es7000_cluster = {
.wait_icr_idle = native_apic_wait_icr_idle,
.safe_wait_icr_idle = native_safe_apic_wait_icr_idle,
- .x86_32_early_logical_apicid = noop_x86_32_early_logical_apicid,
+ .x86_32_early_logical_apicid = es7000_early_logical_apicid,
};
struct apic __refdata apic_es7000 = {
@@ -747,5 +753,5 @@ struct apic __refdata apic_es7000 = {
.wait_icr_idle = native_apic_wait_icr_idle,
.safe_wait_icr_idle = native_safe_apic_wait_icr_idle,
- .x86_32_early_logical_apicid = noop_x86_32_early_logical_apicid,
+ .x86_32_early_logical_apicid = es7000_early_logical_apicid,
};
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|