[ACPI] prevent ES7000 tweak from breaking i386 IOAPIC (Andrew de Quincey)

diff --git a/arch/i386/kernel/dmi_scan.c b/arch/i386/kernel/dmi_scan.c
index dd079e84cf5ec34034c76f5fcb563f60b9770d91..f0bca4869f9fbac7b92304b4073cd5188f1832bf 100644 (file)
--- a/arch/i386/kernel/dmi_scan.c
+++ b/arch/i386/kernel/dmi_scan.c
@@ -16,6 +16,7 @@ EXPORT_SYMBOL(dmi_broken);
 
 int is_sony_vaio_laptop;
 int is_unsafe_smbus;
+int es7000_plat = 0;
 
 struct dmi_header
 {

diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c
index a8ac336748cf840cfa234e4706fc0ab4445192b5..b4b56c26508b11397094858051afa88e78ab1e64 100644 (file)
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/i386/kernel/mpparse.c
@@ -1129,8 +1129,11 @@ void __init mp_parse_prt (void)
                        continue;
                ioapic_pin = irq - mp_ioapic_routing[ioapic].irq_start;
 
-               if (!ioapic && (irq < 16))
-                       irq += 16;
+               if (es7000_plat) {
+                       if (!ioapic && (irq < 16))
+                               irq += 16;
+               }
+
                /* 
                 * Avoid pin reprogramming.  PRTs typically include entries  
                 * with redundant pin->irq mappings (but unique PCI devices);

diff --git a/arch/i386/mach-es7000/es7000.c b/arch/i386/mach-es7000/es7000.c
index 71e71deadbcbcdf90d9544df850d6ab187781f08..defe41e6cb19e7e7192049a789f0c28431202e1b 100644 (file)
--- a/arch/i386/mach-es7000/es7000.c
+++ b/arch/i386/mach-es7000/es7000.c
@@ -51,8 +51,6 @@ struct mip_reg                *host_reg;
 int                    mip_port;
 unsigned long          mip_addr, host_addr;
 
-static int             es7000_plat;
-
 /*
  * Parse the OEM Table
  */

diff --git a/include/asm-i386/system.h b/include/asm-i386/system.h
index e3cd09b5f26e764a8009b620f70b12e5e9856f57..909ba6a3a9c8d53487909e6b482b4ff242df3a05 100644 (file)
--- a/include/asm-i386/system.h
+++ b/include/asm-i386/system.h
@@ -470,6 +470,7 @@ void enable_hlt(void);
 
 extern unsigned long dmi_broken;
 extern int is_sony_vaio_laptop;
+extern int es7000_plat;
 
 #define BROKEN_ACPI_Sx         0x0001
 #define BROKEN_INIT_AFTER_S1   0x0002