Commit 22999244 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

[PATCH] x86_64: Add acpi_skip_timer_override option

Add acpi_skip_timer_override option.  It was missing previously.
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0a658002
...@@ -327,6 +327,10 @@ static __init void parse_cmdline_early (char ** cmdline_p) ...@@ -327,6 +327,10 @@ static __init void parse_cmdline_early (char ** cmdline_p)
else if (!memcmp(from, "acpi=strict", 11)) { else if (!memcmp(from, "acpi=strict", 11)) {
acpi_strict = 1; acpi_strict = 1;
} }
#ifdef CONFIG_X86_IO_APIC
else if (!memcmp(from, "acpi_skip_timer_override", 24))
acpi_skip_timer_override = 1;
#endif
#endif #endif
if (!memcmp(from, "nolapic", 7) || if (!memcmp(from, "nolapic", 7) ||
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment