---

yaml --- r: 304956 b: refs/heads/master c: b732d43 h: refs/heads/master v: v3
git-mirror · May 17, 2012 · 6ce5601 · 6ce5601
1 parent 435af93
commit 6ce5601
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4f5d5440bb860a3e8942ca8f7277a7f31798965
+refs/heads/master: b732d439cb43336cd6d7e804ecb2c81193ef63b0
diff --git a/trunk/kernel/trace/Kconfig b/trunk/kernel/trace/Kconfig
@@ -141,7 +141,6 @@ if FTRACE
 config FUNCTION_TRACER
 	bool "Kernel Function Tracer"
 	depends on HAVE_FUNCTION_TRACER
-	select FRAME_POINTER if !ARM_UNWIND && !PPC && !S390 && !MICROBLAZE
 	select KALLSYMS
 	select GENERIC_TRACER
 	select CONTEXT_SWITCH_TRACER