From: Ingo Molnar Date: Thu, 10 Jul 2008 14:14:56 +0000 (+0200) Subject: x86, VisWS: turn into generic arch, IO-APIC setup fix X-Git-Tag: v2.6.27-rc1~1106^2~14^2~11 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=54ce7f99065cadcbb627f47f2321b76f099fda28;p=linux-2.6-omap-h63xx.git x86, VisWS: turn into generic arch, IO-APIC setup fix skip IO-APIC setup on a VISWS if it's enabled. Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/kernel/setup_visws.c b/arch/x86/kernel/setup_visws.c index e95e9499c8c..e19b91c47e9 100644 --- a/arch/x86/kernel/setup_visws.c +++ b/arch/x86/kernel/setup_visws.c @@ -260,6 +260,13 @@ void __init visws_early_detect(void) mach_get_smp_config_quirk = visws_get_smp_config_quirk; mach_find_smp_config_quirk = visws_find_smp_config_quirk; +#ifdef CONFIG_X86_IO_APIC + /* + * Turn off IO-APIC detection and initialization: + */ + skip_ioapic_setup = 1; +#endif + /* * Get Board rev. * First, we have to initialize the 307 part to allow us access