30 lines
		
	
	
		
			732 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			30 lines
		
	
	
		
			732 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
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)
 | 
						|
 {
 |