diff --git a/[refs] b/[refs]
index 94ac02c6e9ff..9ef14d45fd3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a969e1e223d517dd568c84ba3a66542a72c3680
+refs/heads/master: 06396094b2fad0c429cde795dac4a72bc4d32bf2
diff --git a/trunk/arch/mips/oprofile/Kconfig b/trunk/arch/mips/oprofile/Kconfig
index 55feaf798596..ca395ef06d4e 100644
--- a/trunk/arch/mips/oprofile/Kconfig
+++ b/trunk/arch/mips/oprofile/Kconfig
@@ -11,7 +11,7 @@ config PROFILING
 
 config OPROFILE
 	tristate "OProfile system profiling (EXPERIMENTAL)"
-	depends on PROFILING && EXPERIMENTAL
+	depends on PROFILING && !!MIPS_MT_SMTC && EXPERIMENTAL
 	help
 	  OProfile is a profiling system capable of profiling the
 	  whole system, include the kernel, kernel modules, libraries,