From 7de71fbe7ec4f58b442174146ac9182017ec27aa Mon Sep 17 00:00:00 2001 From: Suresh Siddha Date: Sat, 23 Aug 2008 17:47:11 +0200 Subject: [PATCH] --- yaml --- r: 112803 b: refs/heads/master c: e17941b0c140562d92e5a3bc12b4ad88281c7926 h: refs/heads/master i: 112801: fcf472b746aa124478b7290efec7729c3ff25cf6 112799: d82191d9955e5faeddb882f3fb3faf748207aee9 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/genx2apic_cluster.c | 7 +------ trunk/arch/x86/kernel/genx2apic_phys.c | 7 +------ 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 6223805f9bbf..f529e06db162 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bbb65d2d365efe9951290e61678dcf81ec60add4 +refs/heads/master: e17941b0c140562d92e5a3bc12b4ad88281c7926 diff --git a/trunk/arch/x86/kernel/genx2apic_cluster.c b/trunk/arch/x86/kernel/genx2apic_cluster.c index ef3f3182d50a..0bf0a8624b8c 100644 --- a/trunk/arch/x86/kernel/genx2apic_cluster.c +++ b/trunk/arch/x86/kernel/genx2apic_cluster.c @@ -120,14 +120,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; } static void x2apic_send_IPI_self(int vector) diff --git a/trunk/arch/x86/kernel/genx2apic_phys.c b/trunk/arch/x86/kernel/genx2apic_phys.c index 3229c68aedd4..e2401ab0c46e 100644 --- a/trunk/arch/x86/kernel/genx2apic_phys.c +++ b/trunk/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)