diff --git a/[refs] b/[refs]
index 8ed9b68ce203..bd18d51553b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 499e547057f5bba5cd6f87ebe59b05d0c59da905
+refs/heads/master: 8c9cf542b8a66c231747a550573d910daf17f0e9
diff --git a/trunk/kernel/trace/Kconfig b/trunk/kernel/trace/Kconfig
index cd3134510f3d..a1d2849f2473 100644
--- a/trunk/kernel/trace/Kconfig
+++ b/trunk/kernel/trace/Kconfig
@@ -141,7 +141,7 @@ if FTRACE
 config FUNCTION_TRACER
 	bool "Kernel Function Tracer"
 	depends on HAVE_FUNCTION_TRACER
-	select FRAME_POINTER if !ARM_UNWIND && !S390 && !MICROBLAZE
+	select FRAME_POINTER if !ARM_UNWIND && !PPC && !S390 && !MICROBLAZE
 	select KALLSYMS
 	select GENERIC_TRACER
 	select CONTEXT_SWITCH_TRACER