Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

Ingo Molnar 14 years ago
parent
ec75a71634 d20ac25282
commit
6c8a721327
1 changed files with 1 additions and 1 deletions
Split View Show Diff Stats
  1. 1 1
      kernel/trace/Kconfig

+ 1 - 1
kernel/trace/Kconfig
View File 

@@ -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
 
+	select FRAME_POINTER if !ARM_UNWIND && !S390 && !MICROBLAZE
 
 	select KALLSYMS
 
 	select GENERIC_TRACER
 
 	select CONTEXT_SWITCH_TRACER