rpms/kernel/devel kernel.spec, 1.2075, 1.2076 pci-acpi-disable-aspm-if-no-osc.patch, 1.2, 1.3

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28048

Modified Files:
	kernel.spec pci-acpi-disable-aspm-if-no-osc.patch 
Log Message:
Replace pci-acpi-disable-aspm-if-no-osc.patch with
  updated version from F-13


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.2075
retrieving revision 1.2076
diff -u -p -r1.2075 -r1.2076
--- kernel.spec	15 Jul 2010 12:27:06 -0000	1.2075
+++ kernel.spec	15 Jul 2010 12:30:49 -0000	1.2076
@@ -1857,6 +1857,10 @@ fi
 
 %changelog
 * Thu Jul 15 2010 Chuck Ebbert <cebbert at redhat.com>
+- Replace pci-acpi-disable-aspm-if-no-osc.patch with
+  updated version from F-13
+
+* Thu Jul 15 2010 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.35-rc5-git1
 
 * Tue Jul 13 2010 Chuck Ebbert <cebbert at redhat.com>

pci-acpi-disable-aspm-if-no-osc.patch:
 pci_root.c |    9 +++++++++
 1 file changed, 9 insertions(+)

Index: pci-acpi-disable-aspm-if-no-osc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/pci-acpi-disable-aspm-if-no-osc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pci-acpi-disable-aspm-if-no-osc.patch	7 Jul 2010 09:58:38 -0000	1.2
+++ pci-acpi-disable-aspm-if-no-osc.patch	15 Jul 2010 12:30:49 -0000	1.3
@@ -1,7 +1,5 @@
 From: Matthew Garrett <mjg at redhat.com>
-Date: Tue, 22 Jun 2010 15:25:43 +0000 (-0400)
 Subject: ACPI: Disable ASPM if the platform won't provide _OSC control for PCIe
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjbarnes%2Fpci-2.6.git;a=commitdiff_plain;h=cca74426129c3d33cc606a41539a827d194ba4be
 
 ACPI: Disable ASPM if the platform won't provide _OSC control for PCIe
 
@@ -23,9 +21,7 @@ to vendors being surprised when ASPM get
 OSs refuse to do so. So, for now, let's just disable ASPM if the _OSC
 method doesn't exist or refuses to hand over PCIe capability control.
 
-Acked-by: Rafael J. Wysocki <rjw at sisk.pl>
 Signed-off-by: Matthew Garrett <mjg at redhat.com>
-Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
 ---
 
 diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
@@ -45,9 +41,9 @@ index 4eac593..1f67057 100644
  		acpi_pci_osc_support(root, flags);
  
 +	status = acpi_pci_osc_control_set(root->device->handle,
-+					  OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL);
++					  0);
 +
-+	if (ACPI_FAILURE(status)) {
++	if (status == AE_NOT_EXIST) {
 +		printk(KERN_INFO "Unable to assume PCIe control: Disabling ASPM\n");
 +		pcie_no_aspm();
 +	}