From fc266e91c0a6060b0ea42c94a8e7942d6ad7f019 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Sat, 16 Apr 2005 15:25:17 -0700 Subject: [PATCH] --- yaml --- r: 101 b: refs/heads/master c: 229992446b12fbc755825b6a9f38fc6a273e1f19 h: refs/heads/master i: 99: 04430f3201898cc01b40e87e9b14df1b1a696d0b v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/setup.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4dab320555cc..e7cffb2fe6f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a65800243742480b4b594b619b759749a3cfef4 +refs/heads/master: 229992446b12fbc755825b6a9f38fc6a273e1f19 diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c index 666fe8bcca0e..c091fa114514 100644 --- a/trunk/arch/x86_64/kernel/setup.c +++ b/trunk/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) ||