summaryrefslogtreecommitdiff
path: root/kernel/trace/trace.h
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2015-09-28 20:21:55 (GMT)
committerSteven Rostedt <rostedt@goodmis.org>2015-09-29 17:23:54 (GMT)
commit938db5f569247d13910d4542666709623c4253b0 (patch)
tree21702662ed1f94b9365439c7ef391be7f3e43e89 /kernel/trace/trace.h
parent03905582fd093940cf609956adf6feb494e45346 (diff)
downloadlinux-938db5f569247d13910d4542666709623c4253b0.tar.xz
tracing: Remove unused tracing option "ftrace_preempt"
There was a time where the function tracing would disable interrupts unless specifically told not to, where it would only disable preemption. With the new lockless code, the function tracing never disalbes interrupts and just uses disabling of preemption. Remove the option "ftrace_preempt" as it does nothing anyway. Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/trace.h')
-rw-r--r--kernel/trace/trace.h33
1 files changed, 16 insertions, 17 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index dfa3cd2..19d5c41 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -897,23 +897,22 @@ enum trace_iterator_flags {
TRACE_ITER_BLOCK = 0x80,
TRACE_ITER_STACKTRACE = 0x100,
TRACE_ITER_PRINTK = 0x200,
- TRACE_ITER_PREEMPTONLY = 0x400,
- TRACE_ITER_BRANCH = 0x800,
- TRACE_ITER_ANNOTATE = 0x1000,
- TRACE_ITER_USERSTACKTRACE = 0x2000,
- TRACE_ITER_SYM_USEROBJ = 0x4000,
- TRACE_ITER_PRINTK_MSGONLY = 0x8000,
- TRACE_ITER_CONTEXT_INFO = 0x10000, /* Print pid/cpu/time */
- TRACE_ITER_LATENCY_FMT = 0x20000,
- TRACE_ITER_SLEEP_TIME = 0x40000,
- TRACE_ITER_GRAPH_TIME = 0x80000,
- TRACE_ITER_RECORD_CMD = 0x100000,
- TRACE_ITER_OVERWRITE = 0x200000,
- TRACE_ITER_STOP_ON_FREE = 0x400000,
- TRACE_ITER_IRQ_INFO = 0x800000,
- TRACE_ITER_MARKERS = 0x1000000,
- TRACE_ITER_FUNCTION = 0x2000000,
- TRACE_ITER_DISPLAY_GRAPH = 0x4000000,
+ TRACE_ITER_BRANCH = 0x400,
+ TRACE_ITER_ANNOTATE = 0x800,
+ TRACE_ITER_USERSTACKTRACE = 0x1000,
+ TRACE_ITER_SYM_USEROBJ = 0x2000,
+ TRACE_ITER_PRINTK_MSGONLY = 0x4000,
+ TRACE_ITER_CONTEXT_INFO = 0x8000, /* Print pid/cpu/time */
+ TRACE_ITER_LATENCY_FMT = 0x10000,
+ TRACE_ITER_SLEEP_TIME = 0x20000,
+ TRACE_ITER_GRAPH_TIME = 0x40000,
+ TRACE_ITER_RECORD_CMD = 0x80000,
+ TRACE_ITER_OVERWRITE = 0x100000,
+ TRACE_ITER_STOP_ON_FREE = 0x200000,
+ TRACE_ITER_IRQ_INFO = 0x400000,
+ TRACE_ITER_MARKERS = 0x800000,
+ TRACE_ITER_FUNCTION = 0x1000000,
+ TRACE_ITER_DISPLAY_GRAPH = 0x2000000,
};
/*