aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/trace.c2
-rw-r--r--kernel/trace/trace.h2
2 files changed, 0 insertions, 4 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};
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 790ea8c0e1f3..b41d7b4c2cae 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -470,9 +470,7 @@ enum trace_iterator_flags {
470 TRACE_ITER_SCHED_TREE = 0x200, 470 TRACE_ITER_SCHED_TREE = 0x200,
471 TRACE_ITER_PRINTK = 0x400, 471 TRACE_ITER_PRINTK = 0x400,
472 TRACE_ITER_PREEMPTONLY = 0x800, 472 TRACE_ITER_PREEMPTONLY = 0x800,
473#ifdef CONFIG_BRANCH_TRACER
474 TRACE_ITER_BRANCH = 0x1000, 473 TRACE_ITER_BRANCH = 0x1000,
475#endif
476 TRACE_ITER_ANNOTATE = 0x2000, 474 TRACE_ITER_ANNOTATE = 0x2000,
477}; 475};
478 476