Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c8a7213 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tip/perf/urgent' of... 

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

kernel/trace/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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