From 938db5f569247d13910d4542666709623c4253b0 Mon Sep 17 00:00:00 2001 From: "Steven Rostedt (Red Hat)" Date: Mon, 28 Sep 2015 16:21:55 -0400 Subject: [PATCH] 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 --- kernel/trace/trace.c | 1 - kernel/trace/trace.h | 33 ++++++++++++++++----------------- 2 files changed, 16 insertions(+), 18 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", diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index dfa3cd2feb22..19d5c411d4ec 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, }; /* -- 2.34.1