tree 504f2170d28c9c6068ac46592e4d6088ec81737c
parent 318bf3d3eaae03bff0c6a592d1344ba0439bd535
author Andi Kleen <[EMAIL PROTECTED]> Tue Apr 12 08:25:48 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:25:48 2005
[PATCH] x86_64: Add acpi_skip_timer_override option
Add acpi_skip_timer_override option. It was missing previously.
Signed-off-by: Andi Kleen <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
setup.c | 4 ++++
1 files changed, 4 insertions(+)
Index: arch/x86_64/kernel/setup.c
===================================================================
--- 00820edf99b2914ffd94c4b87566224da7b494ff/arch/x86_64/kernel/setup.c
(mode:100644 sha1:72e02957f25e5f1336f61c76dc21b9b4673cc712)
+++ 504f2170d28c9c6068ac46592e4d6088ec81737c/arch/x86_64/kernel/setup.c
(mode:100644 sha1:10b78bc7f89bf4187447408b2542a9abd13c84f3)
@@ -327,6 +327,10 @@
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) ||
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
