x86: Remove unused 'sis_apic_bug' variable. It was only used on x86_32.

Signed-off-by: Keir Fraser <keir@xen.org>

diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c
index 85191e0af2946957c079b296625368a587c52d32..3c5ffdfb38dc39a33df288d966e647fcd0fe66a0 100644 (file)
--- a/xen/arch/x86/io_apic.c
+++ b/xen/arch/x86/io_apic.c
@@ -46,14 +46,6 @@ bool_t __read_mostly skip_ioapic_setup;
 bool_t __read_mostly ioapic_ack_new = 1;
 bool_t __read_mostly ioapic_ack_forced = 0;
 
-#ifndef sis_apic_bug
-/*
- * Is the SiS APIC rmw bug present?
- * -1 = don't know, 0 = no, 1 = yes
- */
-s8 __read_mostly sis_apic_bug = -1;
-#endif
-
 /*
  * # of IRQ routing registers
  */

diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c
index d75a83f2bca33427fb2d142d7cbb94fdaa853a74..073a2eaf029d01a4dab60b19fd4091e90e2c1222 100644 (file)
--- a/xen/arch/x86/platform_hypercall.c
+++ b/xen/arch/x86/platform_hypercall.c
@@ -207,17 +207,10 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xen_platform_op_t) u_xenpf_op)
             setup_ioapic_dest();
             break;
         case QUIRK_IOAPIC_BAD_REGSEL:
+            dprintk(XENLOG_WARNING,
+                    "Domain 0 thinks that IO-APIC REGSEL is bad\n");
+            break;
         case QUIRK_IOAPIC_GOOD_REGSEL:
-#ifndef sis_apic_bug
-            sis_apic_bug = (quirk_id == QUIRK_IOAPIC_BAD_REGSEL);
-            dprintk(XENLOG_INFO, "Domain 0 says that IO-APIC REGSEL is %s\n",
-                    sis_apic_bug ? "bad" : "good");
-#else
-            if ( sis_apic_bug != (quirk_id == QUIRK_IOAPIC_BAD_REGSEL) )
-                dprintk(XENLOG_WARNING,
-                        "Domain 0 thinks that IO-APIC REGSEL is %s\n",
-                        sis_apic_bug ? "good" : "bad");
-#endif
             break;
         default:
             ret = -EINVAL;

diff --git a/xen/include/asm-x86/io_apic.h b/xen/include/asm-x86/io_apic.h
index e7a4dd675fd97bf1eb90d498b93a718770b02b8f..0cbd04039b24f179e8bd190f772b2ed739c8985e 100644 (file)
--- a/xen/include/asm-x86/io_apic.h
+++ b/xen/include/asm-x86/io_apic.h
@@ -160,16 +160,11 @@ static inline void io_apic_write(unsigned int apic, unsigned int reg, unsigned i
 /*
  * Re-write a value: to be used for read-modify-write
  * cycles where the read already set up the index register.
- *
- * Older SiS APIC requires we rewrite the index regiser
  */
-#define sis_apic_bug 0
 static inline void io_apic_modify(unsigned int apic, unsigned int reg, unsigned int value)
 {
        if (ioapic_reg_remapped(reg))
                return iommu_update_ire_from_apic(apic, reg, value);
-       if (sis_apic_bug)
-               *IO_APIC_BASE(apic) = reg;
        *(IO_APIC_BASE(apic)+4) = value;
 }