Kyle McMartin 1283661
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
Kyle McMartin 1283661
index cea0cd9..c326065 100644
Kyle McMartin 1283661
--- a/arch/x86/Kconfig
Kyle McMartin 1283661
+++ b/arch/x86/Kconfig
Kyle McMartin 1283661
@@ -2142,3 +2142,8 @@ source "crypto/Kconfig"
Kyle McMartin 1283661
 source "arch/x86/kvm/Kconfig"
Kyle McMartin 1283661
 
Kyle McMartin 1283661
 source "lib/Kconfig"
Kyle McMartin 1283661
+
Kyle McMartin 1283661
+config PCI_DEFAULT_USE_CRS
Kyle McMartin 1283661
+	def_bool y
Kyle McMartin 1283661
+	prompt "Use PCI Host Bridge Windows from ACPI by default?"
Kyle McMartin 1283661
+	depends on ACPI
Kyle McMartin 1283661
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
Kyle McMartin 1283661
index 15466c0..3099406 100644
Kyle McMartin 1283661
--- a/arch/x86/pci/acpi.c
Kyle McMartin 1283661
+++ b/arch/x86/pci/acpi.c
Kyle McMartin 1283661
@@ -16,7 +16,11 @@ struct pci_root_info {
Kyle McMartin 1283661
 	int busnum;
Kyle McMartin 1283661
 };
Kyle McMartin 1283661
 
Kyle McMartin 1283661
+#ifdef CONFIG_PCI_DEFAULT_USE_CRS
Kyle McMartin 1283661
 static bool pci_use_crs = true;
Kyle McMartin 1283661
+#else
Kyle McMartin 1283661
+static bool pci_use_crs = false;
Kyle McMartin 1283661
+#endif
Kyle McMartin 1283661
 
Kyle McMartin 1283661
 static int __init set_use_crs(const struct dmi_system_id *id)
Kyle McMartin 1283661
 {