diff --git a/[refs] b/[refs]
index c325183a2fb4..dc402e2516d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efefa6f63fe6f08c16fa28dc9391bd1b89df5274
+refs/heads/master: 54ce7f99065cadcbb627f47f2321b76f099fda28
diff --git a/trunk/arch/x86/kernel/setup_visws.c b/trunk/arch/x86/kernel/setup_visws.c
index e95e9499c8cd..e19b91c47e90 100644
--- a/trunk/arch/x86/kernel/setup_visws.c
+++ b/trunk/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