summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--config-debug2
-rw-r--r--config-nodebug2
-rw-r--r--kernel.spec6
-rw-r--r--linux-2.6-defaults-pci_use_crs.patch29
5 files changed, 41 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 732ccf62f..bb2c37b39 100644
--- a/Makefile
+++ b/Makefile
@@ -89,6 +89,7 @@ debug:
@perl -pi -e 's/# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set/CONFIG_CPU_NOTIFIER_ERROR_INJECT=m/' config-nodebug
@perl -pi -e 's/# CONFIG_DEBUG_PER_CPU_MAPS is not set/CONFIG_DEBUG_PER_CPU_MAPS=y/' config-nodebug
@perl -pi -e 's/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set/' config-nodebug
+ #@perl -pi -e 's/# CONFIG_PCI_DEFAULT_USE_CRS is not set/CONFIG_PCI_DEFAULT_USE_CRS=y/' config-nodebug
@# just in case we're going from extremedebug -> debug
@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
@@ -160,6 +161,7 @@ release:
#@perl -pi -e 's/CONFIG_KDB_KEYBOARD=y/# CONFIG_KDB_KEYBOARD is not set/' config-nodebug
@perl -pi -e 's/CONFIG_DEBUG_PER_CPU_MAPS=y/# CONFIG_DEBUG_PER_CPU_MAPS is not set/' config-nodebug
@perl -pi -e 's/# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/' config-nodebug
+ #@perl -pi -e 's/CONFIG_PCI_DEFAULT_USE_CRS=y/# CONFIG_PCI_DEFAULT_USE_CRS is not set/' config-nodebug
@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-debug
@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
diff --git a/config-debug b/config-debug
index 25cbf2e48..12f8e110c 100644
--- a/config-debug
+++ b/config-debug
@@ -89,5 +89,7 @@ CONFIG_QUOTA_DEBUG=y
# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_PCI_DEFAULT_USE_CRS is not set
+
CONFIG_KGDB_KDB=y
CONFIG_KDB_KEYBOARD=y
diff --git a/config-nodebug b/config-nodebug
index d5b33c674..dac309530 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -89,5 +89,7 @@ CONFIG_QUOTA_DEBUG=y
# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_PCI_DEFAULT_USE_CRS is not set
+
CONFIG_KGDB_KDB=y
CONFIG_KDB_KEYBOARD=y
diff --git a/kernel.spec b/kernel.spec
index 51b9b6157..4a647b93a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -618,6 +618,7 @@ Patch203: linux-2.6-debug-vm-would-have-oomkilled.patch
Patch204: linux-2.6-debug-always-inline-kzalloc.patch
Patch380: linux-2.6-defaults-pci_no_msi.patch
+Patch381: linux-2.6-defaults-pci_use_crs.patch
Patch383: linux-2.6-defaults-aspm.patch
Patch390: linux-2.6-defaults-acpi-video.patch
@@ -1179,6 +1180,7 @@ ApplyPatch linux-2.6-debug-always-inline-kzalloc.patch
#
# make default state of PCI MSI a config option
ApplyPatch linux-2.6-defaults-pci_no_msi.patch
+ApplyPatch linux-2.6-defaults-pci_use_crs.patch
# enable ASPM by default on hardware we expect to work
ApplyPatch linux-2.6-defaults-aspm.patch
@@ -1882,6 +1884,10 @@ fi
# || ||
%changelog
+* Wed Sep 08 2010 Kyle McMartin <kyle@redhat.com>
+- Make pci=use_crs a compile-time config option we can switch the default
+ value of easily.
+
* Wed Sep 08 2010 Kyle McMartin <kyle@redhat.com> 2.6.36-0.18.rc3.git1
- 2.6.36-rc3-git1
- Set CONFIG_CRYPTO_MANAGER_DISABLE_TESTS for nodebug, and unset for debug.
diff --git a/linux-2.6-defaults-pci_use_crs.patch b/linux-2.6-defaults-pci_use_crs.patch
new file mode 100644
index 000000000..18acee12d
--- /dev/null
+++ b/linux-2.6-defaults-pci_use_crs.patch
@@ -0,0 +1,29 @@
+diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
+index cea0cd9..c326065 100644
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -2142,3 +2142,8 @@ source "crypto/Kconfig"
+ source "arch/x86/kvm/Kconfig"
+
+ source "lib/Kconfig"
++
++config PCI_DEFAULT_USE_CRS
++ def_bool y
++ prompt "Use PCI Host Bridge Windows from ACPI by default?"
++ depends on ACPI
+diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
+index 15466c0..3099406 100644
+--- a/arch/x86/pci/acpi.c
++++ b/arch/x86/pci/acpi.c
+@@ -16,7 +16,11 @@ struct pci_root_info {
+ int busnum;
+ };
+
++#ifdef CONFIG_PCI_DEFAULT_USE_CRS
+ static bool pci_use_crs = true;
++#else
++static bool pci_use_crs = false;
++#endif
+
+ static int __init set_use_crs(const struct dmi_system_id *id)
+ {