diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 07:21:21 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 07:21:21 (GMT) |
commit | 9042763808c5285a1a61b45b0fe98a710a4c903c (patch) | |
tree | 349be736a3b56a64c8835df03f127959bfc6e0e0 /arch/x86/kernel/genx2apic_phys.c | |
parent | 446d27338d3b422dd3dfe496d0f362230994d059 (diff) | |
parent | aa3341a168883654d1b13f5931c5ed2762537831 (diff) | |
download | linux-fsl-qoriq-9042763808c5285a1a61b45b0fe98a710a4c903c.tar.xz |
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.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/kernel/genx2apic_phys.c b/arch/x86/kernel/genx2apic_phys.c index 958d537..8f1343d 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) |