---

yaml --- r: 298305 b: refs/heads/master c: 8c9cf54 h: refs/heads/master i: 298303: 14f53e5 v: v3
git-mirror · Feb 27, 2012 · 1a72767 · 1a72767
1 parent 220814a
commit 1a72767
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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