diff options
author | Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> | 2008-11-16 05:37:58 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-17 06:07:27 -0500 |
commit | 0c726da983de0704254250ef6495ca152e7abcca (patch) | |
tree | fe57e18784cef716c65a1f4daa39da20acd15b4f /kernel/trace/trace.c | |
parent | 072b40a15616fe6bea68466e6bffcfcbf5c8f26f (diff) |
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>
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 4a904623e05d..b04923b72ce0 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -259,9 +259,7 @@ static const char *trace_options[] = { | |||
259 | "sched-tree", | 259 | "sched-tree", |
260 | "ftrace_printk", | 260 | "ftrace_printk", |
261 | "ftrace_preempt", | 261 | "ftrace_preempt", |
262 | #ifdef CONFIG_BRANCH_TRACER | ||
263 | "branch", | 262 | "branch", |
264 | #endif | ||
265 | "annotate", | 263 | "annotate", |
266 | NULL | 264 | NULL |
267 | }; | 265 | }; |