commit 6c8a7213278324f381cbcbf51510711ed745d8e6
author Ingo Molnar <mingo@elte.hu> Wed Apr 27 10:31:29 2011 +0200
committer Ingo Molnar <mingo@elte.hu> Wed Apr 27 10:31:29 2011 +0200
tree 1b83e24917d58dcf4af6d6b4d8c26ce012cff43c
parent ec75a71634dabe439db91c1ef51d5099f4493808
parent d20ac252821ab9780ddf00b95629547d3cebc857

Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent

kernel/trace/Kconfig

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 61d7d59f..2ad39e5 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -141,7 +141,7 @@
 config FUNCTION_TRACER
 	bool "Kernel Function Tracer"
 	depends on HAVE_FUNCTION_TRACER
-	select FRAME_POINTER if !ARM_UNWIND && !S390
+	select FRAME_POINTER if !ARM_UNWIND && !S390 && !MICROBLAZE
 	select KALLSYMS
 	select GENERIC_TRACER
 	select CONTEXT_SWITCH_TRACER