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: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 4a90462..b04923b 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -259,9 +259,7 @@
"sched-tree",
"ftrace_printk",
"ftrace_preempt",
-#ifdef CONFIG_BRANCH_TRACER
"branch",
-#endif
"annotate",
NULL
};
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 790ea8c..b41d7b4 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -470,9 +470,7 @@
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,
};
