default to pci=nocrs

This commit is contained in:
Kyle McMartin 2010-09-03 16:21:51 -04:00
parent 5bfb0a6fb8
commit 7ffcbba219
2 changed files with 17 additions and 0 deletions

View File

@ -630,6 +630,7 @@ Patch305: linux-2.6-fix-btusb-autosuspend.patch
Patch310: linux-2.6-usb-wwan-update.patch
Patch370: linux-2.6-defaults-acpi-pci_no_crs.patch
Patch380: linux-2.6-defaults-pci_no_msi.patch
# enable ASPM
Patch383: linux-2.6-defaults-aspm.patch
@ -1263,6 +1264,8 @@ ApplyPatch linux-2.6-debug-always-inline-kzalloc.patch
#
# PCI
#
# default to pci=nocrs
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
@ -2071,6 +2074,7 @@ fi
* Fri Sep 03 2010 Kyle McMartin <kmcmartin@redhat.com> 2.6.34.6-52
- sanity-check-bond-proc_entry.patch (rhbz#604630)
- asix.c: stub out set_mac_address in case it's breaking things (rhbz#629871)
- default to pci=nocrs
* Fri Sep 03 2010 Kyle McMartin <kmcmartin@redhat.com> 2.6.34.6-51
- lirc_imon: move alloc before use (rhbz#629980)

View File

@ -0,0 +1,13 @@
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 7743fb1..3a7f094 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -16,7 +16,7 @@ struct pci_root_info {
int busnum;
};
-static bool pci_use_crs = true;
+static bool pci_use_crs = false;
static int __init set_use_crs(const struct dmi_system_id *id)
{