patch-2.4.27 linux-2.4.27/arch/x86_64/kernel/e820.c

• Lines: 14
• Date: 2004-08-07 16:26:04.631345832 -0700
• Orig file: linux-2.4.26/arch/x86_64/kernel/e820.c
• Orig date: 2004-04-14 06:05:28.000000000 -0700

diff -urN linux-2.4.26/arch/x86_64/kernel/e820.c linux-2.4.27/arch/x86_64/kernel/e820.c
@@ -567,10 +567,10 @@
 			acpi_strict = 1;
 		}
 
-		else if (!memcmp(from, "pci=noacpi", 10)) {
+		else if (!memcmp(from, "pci=noacpi", 10))
+			acpi_disable_pci();
+		else if (!memcmp(from, "acpi=noirq", 10))
 			acpi_noirq_set();
-		}
-
 		else if (!memcmp(from, "acpi_sci=edge", 13))
 			acpi_sci_flags.trigger =  1;
 		else if (!memcmp(from, "acpi_sci=level", 14))