diff --git a/[refs] b/[refs]
index 33b9c2179b0d..29fbf814eac1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcc5c4a2feea3886dc058498b28508b2731720d5
+refs/heads/master: 2a3313f494c2f3f74a27d66f0f14b38558b7dba2
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index c9086e6307a5..b5cda6c03d1d 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -664,6 +664,7 @@ config MAXSMP
 
 config NR_CPUS
 	int "Maximum number of CPUs" if SMP && !MAXSMP
+	range 2 8 if SMP && X86_32 && !X86_BIGSMP
 	range 2 512 if SMP && !MAXSMP
 	default "1" if !SMP
 	default "4096" if MAXSMP