summaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.c
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2015-09-28 16:21:55 -0400
committerSteven Rostedt <rostedt@goodmis.org>2015-09-29 13:23:54 -0400
commit938db5f569247d13910d4542666709623c4253b0 (patch)
tree21702662ed1f94b9365439c7ef391be7f3e43e89 /kernel/trace/trace.c
parent03905582fd093940cf609956adf6feb494e45346 (diff)
downloadlinux-938db5f569247d13910d4542666709623c4253b0.tar.gz
linux-938db5f569247d13910d4542666709623c4253b0.tar.bz2
linux-938db5f569247d13910d4542666709623c4253b0.zip
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.c')
-rw-r--r--kernel/trace/trace.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 9a4ef5afb41c..f2fbf610d20e 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -866,7 +866,6 @@ static const char *trace_options[] = {
"block",
"stacktrace",
"trace_printk",
- "ftrace_preempt",
"branch",
"annotate",
"userstacktrace",