[PATCH] x86_64: Add acpi_skip_timer_override option

Add acpi_skip_timer_override option.  It was missing previously.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 4 insertions, 0 deletions

diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index 666fe8bcca0e..c091fa114514 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/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) ||