From 6ce560139dcb8bbd87c1a1c683a7b782171af655 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Mon, 30 Apr 2012 09:17:03 -0400
Subject: [PATCH] --- yaml --- r: 304956 b: refs/heads/master c:
 b732d439cb43336cd6d7e804ecb2c81193ef63b0 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/trace/Kconfig | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4501d8f0c4dd..a068c8d059fe 100644
--- 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
index a1d2849f2473..d81a1a532994 100644
--- 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