diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 9a4ef5afb41c6b3b2366196d666a36f2ec0fba35..f2fbf610d20e9afd458f520cd5e1584d0e4390b0 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 dfa3cd2feb22b68d0b6967b9442e2f6414ec71a2..19d5c411d4ecfaccad61c63475e18612d4c144ff 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,
 };
 
 /*