[Xen-changelog] [xen-unstable] x86: Remove unused 'sis_apic_bug' variable. It was only used on x86_32.

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1347461553 -3600
# Node ID 991dae046c66db7869fc423adc93572d12c16b93
# Parent  7b658d31b5e1ebaaf9ea9cdc31cdba25d34d68ea
x86: Remove unused 'sis_apic_bug' variable. It was only used on x86_32.

Signed-off-by: Keir Fraser <keir@xxxxxxx>
---


diff -r 7b658d31b5e1 -r 991dae046c66 xen/arch/x86/io_apic.c
--- a/xen/arch/x86/io_apic.c    Wed Sep 12 13:59:26 2012 +0100
+++ b/xen/arch/x86/io_apic.c    Wed Sep 12 15:52:33 2012 +0100
@@ -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 -r 7b658d31b5e1 -r 991dae046c66 xen/arch/x86/platform_hypercall.c
--- a/xen/arch/x86/platform_hypercall.c Wed Sep 12 13:59:26 2012 +0100
+++ b/xen/arch/x86/platform_hypercall.c Wed Sep 12 15:52:33 2012 +0100
@@ -207,17 +207,10 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe
             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 -r 7b658d31b5e1 -r 991dae046c66 xen/include/asm-x86/io_apic.h
--- a/xen/include/asm-x86/io_apic.h     Wed Sep 12 13:59:26 2012 +0100
+++ b/xen/include/asm-x86/io_apic.h     Wed Sep 12 15:52:33 2012 +0100
@@ -160,16 +160,11 @@ static inline void io_apic_write(unsigne
 /*
  * 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;
 }
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog