diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2009-02-17 08:02:14 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-17 12:22:20 +0100 |
| commit | c1eeb2de41d7015678bdd412b48a5f071b84e29a (patch) | |
| tree | 6af99f46f557f9e854e882deac52d23b2fadb5a2 /arch/x86/kernel/genx2apic_phys.c | |
| parent | x86: add x2apic config (diff) | |
| download | linux-c1eeb2de41d7015678bdd412b48a5f071b84e29a.tar.xz linux-c1eeb2de41d7015678bdd412b48a5f071b84e29a.zip | |
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_phys.c')
| -rw-r--r-- | arch/x86/kernel/genx2apic_phys.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/x86/kernel/genx2apic_phys.c b/arch/x86/kernel/genx2apic_phys.c index 5cbae8aa0408..eb1486bb002e 100644 --- a/arch/x86/kernel/genx2apic_phys.c +++ b/arch/x86/kernel/genx2apic_phys.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> static int x2apic_phys; @@ -50,7 +50,7 @@ static void __x2apic_send_IPI_dest(unsigned int apicid, int vector, /* * send the IPI. */ - x2apic_icr_write(cfg, apicid); + native_x2apic_icr_write(cfg, apicid); } static void x2apic_send_IPI_mask(const struct cpumask *mask, int vector) @@ -220,4 +220,11 @@ struct genapic apic_x2apic_phys = { .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, }; |