commit 0a305d2e1bd872fed6a073b27e38d457af2a69b0
author Cal Peake <cp@absolutedigital.net> Tue Sep 13 02:28:07 2005 -0400
committer Linus Torvalds <torvalds@g5.osdl.org> Tue Sep 13 15:07:06 2005 -0700
tree d0eeaf9773bce57e39fa2b39e9f305d896cb185b
parent f3591fff043f5df937120962668c8adfcd3f5b29

[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 <cp@absolutedigital.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

arch/i386/kernel/setup.c

diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index dc39ca6..9b8c8a1 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -848,9 +848,7 @@
 #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 @@
 		/* 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