Skip to content

Commit

Permalink
x86: Implement x86_32_early_logical_apicid() for numaq_32
Browse files Browse the repository at this point in the history
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-12-git-send-email-tj@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Tejun Heo authored and Ingo Molnar committed Jan 28, 2011
1 parent 3b39d93 commit df04cf0
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions arch/x86/kernel/apic/es7000_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -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,
};

0 comments on commit df04cf0

Please sign in to comment.