Drop linux-2.6-defaults-aspm.patch

Fixing ASPM properly will be too difficult in this old kernel.

kernel.spec

@@ -635,8 +635,6 @@ Patch370: linux-2.6-defaults-acpi-pci_no_crs.patch
 Patch371: linux-2.6-defaults-no-pm-async.patch
 
 Patch380: linux-2.6-defaults-pci_no_msi.patch
-# enable ASPM
-Patch383: linux-2.6-defaults-aspm.patch
 # fixes for ASPM
 Patch384: pci-acpi-disable-aspm-if-no-osc.patch
 Patch385: pci-aspm-dont-enable-too-early.patch
@@ -1396,8 +1394,6 @@ ApplyPatch linux-2.6-defaults-acpi-pci_no_crs.patch
 # make default state of PCI MSI a config option
 ApplyPatch linux-2.6-defaults-pci_no_msi.patch
 
-# enable ASPM by default on hardware we expect to work
-ApplyPatch linux-2.6-defaults-aspm.patch
 # disable aspm if acpi doesn't provide an _OSC method
 ApplyPatch pci-acpi-disable-aspm-if-no-osc.patch
 # allow drivers to disable aspm at load time
@@ -2318,6 +2314,10 @@ fi
 %kernel_variant_files %{with_pae_debug} PAEdebug
 
 %changelog
+* Fri Mar 11 2011 Chuck Ebbert <cebbert@redhat.com>
+- Drop linux-2.6-defaults-aspm.patch; fixing ASPM properly will
+  be too difficult in this old kernel.
+
 * Thu Feb 24 2011 Chuck Ebbert <cebbert@redhat.com>
 - Fix crash when dropping filesystem caches (#649871)
 

linux-2.6-defaults-aspm.patch

@@ -1,12 +0,0 @@
-diff -up linux-2.6.30.noarch/drivers/pci/pcie/aspm.c.mjg linux-2.6.30.noarch/drivers/pci/pcie/aspm.c
---- linux-2.6.30.noarch/drivers/pci/pcie/aspm.c.mjg	2009-07-16 22:01:11.000000000 +0100
-+++ linux-2.6.30.noarch/drivers/pci/pcie/aspm.c	2009-07-16 22:01:30.000000000 +0100
-@@ -65,7 +65,7 @@ static LIST_HEAD(link_list);
- #define POLICY_DEFAULT 0	/* BIOS default setting */
- #define POLICY_PERFORMANCE 1	/* high performance */
- #define POLICY_POWERSAVE 2	/* high power saving */
--static int aspm_policy;
-+static int aspm_policy = POLICY_POWERSAVE;
- static const char *policy_str[] = {
- 	[POLICY_DEFAULT] = "default",
- 	[POLICY_PERFORMANCE] = "performance",