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 <mingo@elte.hu>

1 files changed, 7 insertions, 0 deletions

diff --git a/arch/x86/kernel/setup_visws.c b/arch/x86/kernel/setup_visws.c
index e95e9499c8cd..e19b91c47e90 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