diff --git a/[refs] b/[refs]
index 78864467fa4a..c538658c0dec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a32cf3975bed3b84491f8ffeb24abe8c45d86ab0
+refs/heads/master: 3b8d1fe0f28202ce1592d9fbc216959b49b72c95
diff --git a/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug
index 554ee688a9f8..c795a17a7043 100644
--- a/trunk/lib/Kconfig.debug
+++ b/trunk/lib/Kconfig.debug
@@ -218,7 +218,7 @@ config LOCKDEP
 	bool
 	depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
 	select STACKTRACE
-	select FRAME_POINTER
+	select FRAME_POINTER if !X86
 	select KALLSYMS
 	select KALLSYMS_ALL