diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2009-02-16 23:02:14 -0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-17 12:22:20 +0100 |
| commit | c1eeb2de41d7015678bdd412b48a5f071b84e29a (patch) | |
| tree | 6af99f46f557f9e854e882deac52d23b2fadb5a2 /arch/x86/kernel/genx2apic_cluster.c | |
| parent | 06cd9a7dc8a58186060a91b6ddc031057435fd34 (diff) | |
| download | op-kernel-dev-c1eeb2de41d7015678bdd412b48a5f071b84e29a.zip op-kernel-dev-c1eeb2de41d7015678bdd412b48a5f071b84e29a.tar.gz | |
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.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/x86/kernel/genx2apic_cluster.c b/arch/x86/kernel/genx2apic_cluster.c index 7c87156..dd6e8d6 100644 --- a/arch/x86/kernel/genx2apic_cluster.c +++ b/arch/x86/kernel/genx2apic_cluster.c @@ -7,8 +7,8 @@ #include <linux/dmar.h> #include <asm/smp.h> -#include <asm/ipi.h> #include <asm/genapic.h> +#include <asm/ipi.h> DEFINE_PER_CPU(u32, x86_cpu_to_logical_apicid); @@ -46,7 +46,7 @@ static void /* * send the IPI. */ - x2apic_icr_write(cfg, apicid); + native_x2apic_icr_write(cfg, apicid); } /* @@ -234,4 +234,11 @@ struct genapic apic_x2apic_cluster = { .smp_callin_clear_local_apic = NULL, .store_NMI_vector = NULL, .inquire_remote_apic = NULL, + + .read = native_apic_msr_read, + .write = native_apic_msr_write, + .icr_read = native_x2apic_icr_read, + .icr_write = native_x2apic_icr_write, + .wait_icr_idle = native_x2apic_wait_icr_idle, + .safe_wait_icr_idle = native_safe_x2apic_wait_icr_idle, }; |
