summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2005-04-16 15:25:17 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 15:25:17 -0700
commit229992446b12fbc755825b6a9f38fc6a273e1f19 (patch)
treeff7a2eeceb0f8a036a681e434c4d45cd4b915f38 /arch
parent0a65800243742480b4b594b619b759749a3cfef4 (diff)
[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>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86_64/kernel/setup.c4
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) ||