From: Cal Peake Date: Tue, 13 Sep 2005 06:28:07 +0000 (-0400) Subject: [PATCH] Even more fallout from ATI Xpress timer workaround X-Git-Tag: v2.6.14-rc2~44 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0a305d2e1bd872fed6a073b27e38d457af2a69b0;p=linux-2.6-omap-h63xx.git [PATCH] Even more fallout from ATI Xpress timer workaround disable_timer_pin_1 needs IO-APIC, not just local APIC. Signed-off-by: Cal Peake Signed-off-by: Linus Torvalds --- diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c index dc39ca6a7ec..9b8c8a19824 100644 --- a/arch/i386/kernel/setup.c +++ b/arch/i386/kernel/setup.c @@ -848,9 +848,7 @@ static void __init parse_cmdline_early (char ** cmdline_p) #ifdef CONFIG_X86_IO_APIC else if (!memcmp(from, "acpi_skip_timer_override", 24)) acpi_skip_timer_override = 1; -#endif -#ifdef CONFIG_X86_LOCAL_APIC if (!memcmp(from, "disable_timer_pin_1", 19)) disable_timer_pin_1 = 1; if (!memcmp(from, "enable_timer_pin_1", 18)) @@ -859,7 +857,7 @@ static void __init parse_cmdline_early (char ** cmdline_p) /* disable IO-APIC */ else if (!memcmp(from, "noapic", 6)) disable_ioapic_setup(); -#endif /* CONFIG_X86_LOCAL_APIC */ +#endif /* CONFIG_X86_IO_APIC */ #endif /* CONFIG_ACPI */ #ifdef CONFIG_X86_LOCAL_APIC