Commit 938db5f5 authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

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: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 03905582

kernel/trace/trace.c

+0 −1
Original line number Diff line number Diff line
@@ -866,7 +866,6 @@ static const char *trace_options[] = { 
	"block",

	"stacktrace",

	"trace_printk",

	"ftrace_preempt",

	"branch",

	"annotate",

	"userstacktrace",

kernel/trace/trace.h

+16 −17
Original line number Diff line number Diff line
@@ -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,

};



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE