remove patch that broke the build

diff --git a/queue-3.0/pata_via-disable-atapi-dma-on-averatec-3200.patch b/queue-3.0/pata_via-disable-atapi-dma-on-averatec-3200.patch
deleted file mode 100644 (file)
index 065f37e..0000000
--- a/queue-3.0/pata_via-disable-atapi-dma-on-averatec-3200.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 6d0e194d2eefcaab6dbdca1f639748660144acb5 Mon Sep 17 00:00:00 2001
-From: Tejun Heo <tj@kernel.org>
-Date: Thu, 4 Aug 2011 11:15:07 +0200
-Subject: pata_via: disable ATAPI DMA on AVERATEC 3200
-
-From: Tejun Heo <tj@kernel.org>
-
-commit 6d0e194d2eefcaab6dbdca1f639748660144acb5 upstream.
-
-On AVERATEC 3200, pata_via causes memory corruption with ATAPI DMA,
-which often leads to random kernel oops.  The cause of the problem is
-not well understood yet and only small subset of machines using the
-controller seem affected.  Blacklist ATAPI DMA on the machine.
-
-Signed-off-by: Tejun Heo <tj@kernel.org>
-Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=11426
-Reported-and-tested-by: Jim Bray <jimsantelmo@gmail.com>
-Cc: Alan Cox <alan@linux.intel.com>
-Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/ata/pata_via.c |   18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
---- a/drivers/ata/pata_via.c
-+++ b/drivers/ata/pata_via.c
-@@ -124,6 +124,17 @@ static const struct via_isa_bridge {
-       { NULL }
- };
- 
-+static const struct dmi_system_id no_atapi_dma_dmi_table[] = {
-+      {
-+              .ident = "AVERATEC 3200",
-+              .matches = {
-+                      DMI_MATCH(DMI_BOARD_VENDOR, "AVERATEC"),
-+                      DMI_MATCH(DMI_BOARD_NAME, "3200"),
-+              },
-+      },
-+      { }
-+};
-+
- struct via_port {
-       u8 cached_device;
- };
-@@ -355,6 +366,13 @@ static unsigned long via_mode_filter(str
-                       mask &= ~ ATA_MASK_UDMA;
-               }
-       }
-+
-+      if (dev->class == ATA_DEV_ATAPI &&
-+          dmi_check_system(no_atapi_dma_dmi_table)) {
-+              ata_dev_warn(dev, "controller locks up on ATAPI DMA, forcing PIO\n");
-+              mask &= ATA_MASK_PIO;
-+      }
-+
-       return mask;
- }
- 

diff --git a/queue-3.0/series b/queue-3.0/series
index 5661032c71c4fdc40c12816d550ff31e61ffe2af..d909a3917cc1570b71634a0e7f9d4667eb760479 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -4,7 +4,6 @@ befs-validate-length-of-long-symbolic-links.patch
 i7core_edac-fixed-typo-in-error-count-calculation.patch
 possible-memory-corruption-on-mount.patch
 x86-intel-power-correct-the-msr_ia32_energy_perf_bias.patch
-pata_via-disable-atapi-dma-on-averatec-3200.patch
 pnfs-obj-fix-the-comp_index-0-case.patch
 pnfs-obj-bug-when-we-are-running-out-of-bio.patch
 nfsv4.1-fix-the-callback-highest_used_slotid-behaviour.patch