[ACPI] acpi=force overrides blacklist pci=noacpi or acpi=noirq (Andi Kleen)

98b20278 · Len Brown · Len Brown · 086c15bd · 98b20278
Commit 98b20278 authored Jun 03, 2004 by Len Brown Committed by Len Brown Jun 03, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 6 deletions

arch/i386/kernel/dmi_scan.c arch/i386/kernel/dmi_scan.c +12 -6

No files found.
--- a/arch/i386/kernel/dmi_scan.c
+++ b/arch/i386/kernel/dmi_scan.c
@@ -546,15 +546,21 @@ static __init int ignore_timer_override(struct dmi_blacklist *d)
 #ifdef	CONFIG_ACPI_PCI
 static __init int disable_acpi_irq(struct dmi_blacklist *d) 
-{ 
+{
-	printk(KERN_NOTICE "%s detected: force use of acpi=noirq\n", d->ident); 	
+	if (!acpi_force) {
-	acpi_noirq_set();
+		printk(KERN_NOTICE "%s detected: force use of acpi=noirq\n",
+		       d->ident); 	
+		acpi_noirq_set();
+	}
 	return 0;
 }
 static __init int disable_acpi_pci(struct dmi_blacklist *d) 
-{ 
+{
-	printk(KERN_NOTICE "%s detected: force use of pci=noacpi\n", d->ident); 	
+	if (!acpi_force) {
-	acpi_disable_pci();
+		printk(KERN_NOTICE "%s detected: force use of pci=noacpi\n",
+		       d->ident); 	
+		acpi_disable_pci();
+	}
 	return 0;
 }  
 #endif