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

• Lines: 20
• Date: 2003-08-25 04:44:40.000000000 -0700
• Orig file: linux-2.4.21/arch/x86_64/kernel/e820.c
• Orig date: 2003-06-13 07:51:32.000000000 -0700

diff -urN linux-2.4.21/arch/x86_64/kernel/e820.c linux-2.4.22/arch/x86_64/kernel/e820.c
@@ -500,6 +500,7 @@
 extern char command_line[], saved_command_line[];
 extern int fallback_aper_order;
 extern int iommu_setup(char *opt);
+extern int acpi_disabled;
 
 void __init parse_mem_cmdline (char ** cmdline_p)
 {
@@ -537,8 +538,10 @@
 		else if (!memcmp(from,"iommu=",6)) { 
 			iommu_setup(from+6); 
 		} 	
-		
 #endif
+ 		else if (!memcmp(from, "acpi=off", 8))
+  			acpi_disabled = 1;
+		
 	next:
 		c = *(from++);
 		if (!c)