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

Commit 0c726da9 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Ingo Molnar
Browse files

tracing: branch tracer, fix writing to trace/trace_options 



Impact: fix trace_options behavior

writing to trace/trace_options use the index of the array
to find the value of the flag. With branch tracer flag
defined conditionally, this breaks writing to trace_options
with branch tracer disabled.

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 072b40a1

kernel/trace/trace.c

+0 −2
Original line number Diff line number Diff line
@@ -259,9 +259,7 @@ static const char *trace_options[] = { 
	"sched-tree",

	"ftrace_printk",

	"ftrace_preempt",

#ifdef CONFIG_BRANCH_TRACER

	"branch",

#endif

	"annotate",

	NULL

};

kernel/trace/trace.h

+0 −2
Original line number Diff line number Diff line
@@ -470,9 +470,7 @@ enum trace_iterator_flags { 
	TRACE_ITER_SCHED_TREE		= 0x200,

	TRACE_ITER_PRINTK		= 0x400,

	TRACE_ITER_PREEMPTONLY		= 0x800,

#ifdef CONFIG_BRANCH_TRACER

	TRACE_ITER_BRANCH		= 0x1000,

#endif

	TRACE_ITER_ANNOTATE		= 0x2000,

};