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>

diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 47ff978aecfd906c06abf7f2cf5f2caa04e12e04..cb54d9e20f94682f1a5153ac0c8371f857c250a8 100644 (file)
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -145,6 +145,11 @@ static int modern_apic(void)
        return lapic_get_version() >= 0x14;
 }
 
+/*
+ * Paravirt kernels also might be using these below ops. So we still
+ * use generic apic_read()/apic_write(), which might be pointing to different
+ * ops in PARAVIRT case.
+ */
 void xapic_wait_icr_idle(void)
 {
        while (apic_read(APIC_ICR) & APIC_ICR_BUSY)

diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c
index cf30743545533b94cfa0f20187bdafdd9f7896f8..237082833c14afc142aa3ce1786f5f5ec1c47163 100644 (file)
--- 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
 
        /*