aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/kernel/vmi_32.c
diff options
context:
space:
mode:
authorSuresh Siddha <suresh.b.siddha@intel.com>2008-07-18 09:59:40 -0700
committerIngo Molnar <mingo@elte.hu>2008-07-18 19:05:29 +0200
commit9a8f0e6b5dfe3b4f330fc82b16a4000f5688fce8 (patch)
tree3e6f8b6efeec51f8d0b32a6dcd8ed39183667794 /arch/x86/kernel/vmi_32.c
parent94a8c3c2437c8946f1b6c8e0b2c560a7db8ed3c6 (diff)
downloadlinux-linaro-android-9a8f0e6b5dfe3b4f330fc82b16a4000f5688fce8.tar.gz
x86: let 32bit use apic_ops too - fix
Fix VMI apic_ops. Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> Acked-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/vmi_32.c')
-rw-r--r--arch/x86/kernel/vmi_32.c51
1 files changed, 3 insertions, 48 deletions
diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c
index cf307435455..237082833c1 100644
--- a/arch/x86/kernel/vmi_32.c
+++ b/arch/x86/kernel/vmi_32.c
@@ -676,50 +676,6 @@ static inline int __init probe_vmi_rom(void)
return 0;
}
-#ifdef CONFIG_X86_LOCAL_APIC
-static u32 vmi_apic_read(u32 reg)
-{
- return 0;
-}
-
-static void vmi_apic_write(u32 reg, u32 val)
-{
- /* Warn to see if there's any stray references */
- WARN_ON(1);
-}
-
-static u64 vmi_apic_icr_read(void)
-{
- return 0;
-}
-
-static void vmi_apic_icr_write(u32 low, u32 id)
-{
- /* Warn to see if there's any stray references */
- WARN_ON(1);
-}
-
-static void vmi_apic_wait_icr_idle(void)
-{
- return;
-}
-
-static u32 vmi_safe_apic_wait_icr_idle(void)
-{
- return 0;
-}
-
-static struct apic_ops vmi_basic_apic_ops = {
- .read = vmi_apic_read,
- .write = vmi_apic_write,
- .write_atomic = vmi_apic_write,
- .icr_read = vmi_apic_icr_read,
- .icr_write = vmi_apic_icr_write,
- .wait_icr_idle = vmi_apic_wait_icr_idle,
- .safe_wait_icr_idle = vmi_safe_apic_wait_icr_idle,
-};
-#endif
-
/*
* VMI setup common to all processors
*/
@@ -948,10 +904,9 @@ static inline int __init activate_vmi(void)
#endif
#ifdef CONFIG_X86_LOCAL_APIC
- para_fill(vmi_basic_apic_ops.read, APICRead);
- para_fill(vmi_basic_apic_ops.write, APICWrite);
- para_fill(vmi_basic_apic_ops.write_atomic, APICWrite);
- apic_ops = &vmi_basic_apic_ops;
+ para_fill(apic_ops->read, APICRead);
+ para_fill(apic_ops->write, APICWrite);
+ para_fill(apic_ops->write_atomic, APICWrite);
#endif
/*