From: Andi Kleen <ak@suse.de>
Date: Sat, 16 Apr 2005 22:25:17 +0000 (-0700)
Subject: [PATCH] x86_64: Add acpi_skip_timer_override option
X-Git-Tag: v2.6.12-rc3~145
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=229992446b12fbc755825b6a9f38fc6a273e1f19;p=~emulex%2Finfiniband.git

[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>
---

diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index 666fe8bcca0..c091fa11451 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) ||