diff --git a/[refs] b/[refs]
index 00d7f02a5ab0..13eb80746c74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7cefaa20e798c547f569ca3f79547f820c802997
+refs/heads/master: 3fa7b3487a1317f7d3be3043dbea316ca75abed5
diff --git a/trunk/include/asm-x86/mach-default/smpboot_hooks.h b/trunk/include/asm-x86/mach-default/smpboot_hooks.h
index 7f45f6311059..8e1c6c06d057 100644
--- a/trunk/include/asm-x86/mach-default/smpboot_hooks.h
+++ b/trunk/include/asm-x86/mach-default/smpboot_hooks.h
@@ -41,4 +41,6 @@ static inline void smpboot_setup_io_apic(void)
 	 */
 	if (!skip_ioapic_setup && nr_ioapics)
 		setup_IO_APIC();
+	else
+		nr_ioapics = 0;
 }