diff --git a/[refs] b/[refs]
index f0250c454d7e..964919cb1d07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea3df4ac7d4adad915e2d0431a9407b10617114c
+refs/heads/master: 8cde4a3162fdcccaf0ecbf3c21cdb13df422936d
diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig
index 14af6cce2fa2..9c92b491733f 100644
--- a/trunk/arch/mips/Kconfig
+++ b/trunk/arch/mips/Kconfig
@@ -1690,6 +1690,7 @@ config NR_CPUS
 	depends on SMP
 	default "64" if SGI_IP27
 	default "2"
+	default "8" if MIPS_MT_SMTC
 	help
 	  This allows you to specify the maximum number of CPUs which this
 	  kernel will support.  The maximum supported value is 32 for 32-bit