---

yaml --- r: 101 b: refs/heads/master c: 2299924 h: refs/heads/master i: 99: 04430f3 v: v3
git-mirror · Apr 16, 2005 · fc266e9 · fc266e9
1 parent 310c9fe
commit fc266e9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a65800243742480b4b594b619b759749a3cfef4
+refs/heads/master: 229992446b12fbc755825b6a9f38fc6a273e1f19
diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c
@@ -327,6 +327,10 @@ static __init void parse_cmdline_early (char ** cmdline_p)
 		else if (!memcmp(from, "acpi=strict", 11)) {
 			acpi_strict = 1;
 		}
+#ifdef CONFIG_X86_IO_APIC
+		else if (!memcmp(from, "acpi_skip_timer_override", 24))
+			acpi_skip_timer_override = 1;
+#endif
 #endif
 
 		if (!memcmp(from, "nolapic", 7) ||