Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
This commit is contained in:
commit
6c8a721327
1 changed files with 1 additions and 1 deletions
|
@ -141,7 +141,7 @@ if FTRACE
|
||||||
config FUNCTION_TRACER
|
config FUNCTION_TRACER
|
||||||
bool "Kernel Function Tracer"
|
bool "Kernel Function Tracer"
|
||||||
depends on HAVE_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 KALLSYMS
|
||||||
select GENERIC_TRACER
|
select GENERIC_TRACER
|
||||||
select CONTEXT_SWITCH_TRACER
|
select CONTEXT_SWITCH_TRACER
|
||||||
|
|
Loading…
Reference in a new issue