diff --git a/[refs] b/[refs]
index f6a0c44a7c91..1e5fca797a82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36ef4944ee8118491631e317e406f9bd15e20e97
+refs/heads/master: 1ff2f20de354a621ef4b56b9cfe6f9139a7e493b
diff --git a/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c
index 2912fa3a8ef2..4c3cff574947 100644
--- a/trunk/arch/x86/kernel/smpboot.c
+++ b/trunk/arch/x86/kernel/smpboot.c
@@ -1000,7 +1000,7 @@ static int __init smp_sanity_check(unsigned max_cpus)
 {
 	preempt_disable();
 
-#ifndef CONFIG_X86_BIGSMP
+#if !defined(CONFIG_X86_BIGSMP) && defined(CONFIG_X86_32)
 	if (def_to_bigsmp && nr_cpu_ids > 8) {
 		unsigned int cpu;
 		unsigned nr;