Commit 0a305d2e authored by Cal Peake's avatar Cal Peake Committed by Linus Torvalds
Browse files

[PATCH] Even more fallout from ATI Xpress timer workaround 



disable_timer_pin_1 needs IO-APIC, not just local APIC.

Signed-off-by: default avatarCal Peake <cp@absolutedigital.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f3591fff

arch/i386/kernel/setup.c

+1 −3
Original line number Diff line number Diff line
@@ -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