aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/genx2apic_cluster.c
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2009-02-17 02:02:14 -0500
committerIngo Molnar <mingo@elte.hu>2009-02-17 06:22:20 -0500
commitc1eeb2de41d7015678bdd412b48a5f071b84e29a (patch)
tree6af99f46f557f9e854e882deac52d23b2fadb5a2 /arch/x86/kernel/genx2apic_cluster.c
parent06cd9a7dc8a58186060a91b6ddc031057435fd34 (diff)
x86: fold apic_ops into genapic
Impact: cleanup make it simpler, don't need have one extra struct. v2: fix the sgi_uv build Signed-off-by: Yinghai Lu <yinghai@kernel.org> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/genx2apic_cluster.c')
-rw-r--r--arch/x86/kernel/genx2apic_cluster.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/x86/kernel/genx2apic_cluster.c b/arch/x86/kernel/genx2apic_cluster.c
index 7c87156b6411..dd6e8d685426 100644
--- a/arch/x86/kernel/genx2apic_cluster.c
+++ b/arch/x86/kernel/genx2apic_cluster.c
@@ -7,8 +7,8 @@
7#include <linux/dmar.h> 7#include <linux/dmar.h>
8 8
9#include <asm/smp.h> 9#include <asm/smp.h>
10#include <asm/ipi.h>
11#include <asm/genapic.h> 10#include <asm/genapic.h>
11#include <asm/ipi.h>
12 12
13DEFINE_PER_CPU(u32, x86_cpu_to_logical_apicid); 13DEFINE_PER_CPU(u32, x86_cpu_to_logical_apicid);
14 14
@@ -46,7 +46,7 @@ static void
46 /* 46 /*
47 * send the IPI. 47 * send the IPI.
48 */ 48 */
49 x2apic_icr_write(cfg, apicid); 49 native_x2apic_icr_write(cfg, apicid);
50} 50}
51 51
52/* 52/*
@@ -234,4 +234,11 @@ struct genapic apic_x2apic_cluster = {
234 .smp_callin_clear_local_apic = NULL, 234 .smp_callin_clear_local_apic = NULL,
235 .store_NMI_vector = NULL, 235 .store_NMI_vector = NULL,
236 .inquire_remote_apic = NULL, 236 .inquire_remote_apic = NULL,
237
238 .read = native_apic_msr_read,
239 .write = native_apic_msr_write,
240 .icr_read = native_x2apic_icr_read,
241 .icr_write = native_x2apic_icr_write,
242 .wait_icr_idle = native_x2apic_wait_icr_idle,
243 .safe_wait_icr_idle = native_safe_x2apic_wait_icr_idle,
237}; 244};