delete queue-2.6.26/x86-sb450-skip-irq0-override-if-it-is-not-routed-to-int2-of-ioapi...

diff --git a/queue-2.6.26/series b/queue-2.6.26/series
index 29eb0506625ba634d412c6ac4bc23b5193991275..bb0f6eb608e3fb276c390c94bd36b7c0ab5f0a93 100644 (file)
--- a/queue-2.6.26/series
+++ b/queue-2.6.26/series
@@ -1,4 +1,3 @@
-x86-sb450-skip-irq0-override-if-it-is-not-routed-to-int2-of-ioapic.patch
 x86-reserve-first_device_vector-in-used_vectors-bitmap.patch
 x86-improve-up-kernel-when-cpu-hotplug-and-smp-is-enabled.patch
 x86-early_ioremap-fix-fencepost-error.patch

diff --git a/queue-2.6.26/x86-sb450-skip-irq0-override-if-it-is-not-routed-to-int2-of-ioapic.patch b/queue-2.6.26/x86-sb450-skip-irq0-override-if-it-is-not-routed-to-int2-of-ioapic.patch
deleted file mode 100644 (file)
index 953187f..0000000
--- a/queue-2.6.26/x86-sb450-skip-irq0-override-if-it-is-not-routed-to-int2-of-ioapic.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From jejb@kernel.org  Wed Oct 15 14:44:01 2008
-From: Andreas Herrmann <andreas.herrmann3@amd.com>
-Date: Sun, 12 Oct 2008 19:40:11 GMT
-Subject: x86: SB450: skip IRQ0 override if it is not routed to INT2 of IOAPIC
-To: jejb@kernel.org, stable@kernel.org
-Message-ID: <200810121940.m9CJeBqq024591@hera.kernel.org>
-
-From: Andreas Herrmann <andreas.herrmann3@amd.com>
-
-commit 33fb0e4eb53f16af312f9698f974e2e64af39c12 upstream
-
-On some HP nx6... laptops (e.g. nx6325) BIOS reports an IRQ0 override
-but the SB450 chipset is configured such that timer interrupts goe to
-INT0 of IOAPIC.
-
-Check IRQ0 routing and if it is routed to INT0 of IOAPIC skip the
-timer override.
-
-[ This more generic PCI ID based quirk should alleviate the need for
-  dmi_ignore_irq0_timer_override DMI quirks. ]
-
-Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
-Acked-by: "Maciej W. Rozycki" <macro@linux-mips.org>
-Tested-by: Dmitry Torokhov <dtor@mail.ru>
-Signed-off-by: Ingo Molnar <mingo@elte.hu>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- arch/x86/kernel/early-quirks.c |   48 +++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 48 insertions(+)
-
---- a/arch/x86/kernel/early-quirks.c
-+++ b/arch/x86/kernel/early-quirks.c
-@@ -109,6 +109,52 @@ static void __init ati_bugs(int num, int
- #endif
- }
- 
-+static u32 ati_ixp4x0_rev(int num, int slot, int func)
-+{
-+      u32 d;
-+      u8  b;
-+
-+      b = read_pci_config_byte(num, slot, func, 0xac);
-+      b &= ~(1<<5);
-+      write_pci_config_byte(num, slot, func, 0xac, b);
-+
-+      d = read_pci_config(num, slot, func, 0x70);
-+      d |= 1<<8;
-+      write_pci_config(num, slot, func, 0x70, d);
-+
-+      d = read_pci_config(num, slot, func, 0x8);
-+      d &= 0xff;
-+      return d;
-+}
-+
-+static void __init ati_bugs(int num, int slot, int func)
-+{
-+#if defined(CONFIG_ACPI) && defined (CONFIG_X86_IO_APIC)
-+      u32 d;
-+      u8  b;
-+
-+      if (acpi_use_timer_override)
-+              return;
-+
-+      d = ati_ixp4x0_rev(num, slot, func);
-+      if (d  < 0x82)
-+              acpi_skip_timer_override = 1;
-+      else {
-+              /* check for IRQ0 interrupt swap */
-+              outb(0x72, 0xcd6); b = inb(0xcd7);
-+              if (!(b & 0x2))
-+                      acpi_skip_timer_override = 1;
-+      }
-+
-+      if (acpi_skip_timer_override) {
-+              printk(KERN_INFO "SB4X0 revision 0x%x\n", d);
-+              printk(KERN_INFO "Ignoring ACPI timer override.\n");
-+              printk(KERN_INFO "If you got timer trouble "
-+                     "try acpi_use_timer_override\n");
-+      }
-+#endif
-+}
-+
- #define QFLAG_APPLY_ONCE      0x1
- #define QFLAG_APPLIED         0x2
- #define QFLAG_DONE            (QFLAG_APPLY_ONCE|QFLAG_APPLIED)
-@@ -130,6 +176,8 @@ static struct chipset early_qrk[] __init
-         PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, QFLAG_APPLY_ONCE, ati_bugs },
-       { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB,
-         PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, fix_hypertransport_config },
-+      { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS,
-+        PCI_CLASS_SERIAL_SMBUS, PCI_ANY_ID, 0, ati_bugs },
-       {}
- };
-