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

+1 -1
+1 -1
kernel/trace/Kconfig
··· 141 141 config FUNCTION_TRACER 142 142 bool "Kernel Function Tracer" 143 143 depends on HAVE_FUNCTION_TRACER 144 - select FRAME_POINTER if !ARM_UNWIND && !S390 144 + select FRAME_POINTER if !ARM_UNWIND && !S390 && !MICROBLAZE 145 145 select KALLSYMS 146 146 select GENERIC_TRACER 147 147 select CONTEXT_SWITCH_TRACER