diff --git a/[refs] b/[refs]
index f72267491702..29dbeeee3bd6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db36cc7d6d9e538481e60fae7f56646b92557526
+refs/heads/master: 35a6ff5417bf94c9e19b6b55a9eb6eea14cc7be7
diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig
index f1486f8a3e6d..bf9aafad4978 100644
--- a/trunk/arch/i386/Kconfig
+++ b/trunk/arch/i386/Kconfig
@@ -214,6 +214,17 @@ config X86_ES7000
 
 endchoice
 
+config SCHED_NO_NO_OMIT_FRAME_POINTER
+	bool "Single-depth WCHAN output"
+	default y
+	help
+	  Calculate simpler /proc/<PID>/wchan values. If this option
+	  is disabled then wchan values will recurse back to the
+	  caller function. This provides more accurate wchan values,
+	  at the expense of slightly more scheduling overhead.
+
+	  If in doubt, say "Y".
+
 config PARAVIRT
 	bool "Paravirtualization support (EXPERIMENTAL)"
 	depends on EXPERIMENTAL