summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/genx2apic_phys.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-05 09:21:21 +0200
committerIngo Molnar <mingo@elte.hu>2008-09-05 09:21:21 +0200
commit9042763808c5285a1a61b45b0fe98a710a4c903c (patch)
tree349be736a3b56a64c8835df03f127959bfc6e0e0 /arch/x86/kernel/genx2apic_phys.c
parentMerge branch 'x86/cpu' into x86/core (diff)
parentMerge branch 'x86/cpu' into x86/x2apic (diff)
downloadlinux-9042763808c5285a1a61b45b0fe98a710a4c903c.tar.xz
linux-9042763808c5285a1a61b45b0fe98a710a4c903c.zip
Merge branch 'x86/x2apic' into x86/core
Conflicts: arch/x86/kernel/cpu/common_64.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/genx2apic_phys.c')
-rw-r--r--arch/x86/kernel/genx2apic_phys.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/kernel/genx2apic_phys.c b/arch/x86/kernel/genx2apic_phys.c
index 958d537b4cc9..8f1343df2627 100644
--- a/arch/x86/kernel/genx2apic_phys.c
+++ b/arch/x86/kernel/genx2apic_phys.c
@@ -118,14 +118,9 @@ static unsigned long set_apic_id(unsigned int id)
return x;
}
-static unsigned int x2apic_read_id(void)
-{
- return apic_read(APIC_ID);
-}
-
static unsigned int phys_pkg_id(int index_msb)
{
- return x2apic_read_id() >> index_msb;
+ return current_cpu_data.initial_apicid >> index_msb;
}
void x2apic_send_IPI_self(int vector)