tracing: Use CONFIG_PREEMPTION

CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT.
Both PREEMPT and PREEMPT_RT require the same functionality which today
depends on CONFIG_PREEMPT.

Add additional header output for PREEMPT_RT.
Link: http://lkml.kernel.org/r/20191015191821.11479-34-bigeasy@linutronix.de
Cc: Ingo Molnar <mingo@redhat.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

diff --git a/Documentation/trace/ftrace-uses.rst b/Documentation/trace/ftrace-uses.rst
index 740bd02..2a05e77 100644 (file)
--- a/Documentation/trace/ftrace-uses.rst
+++ b/Documentation/trace/ftrace-uses.rst
@@ -146,7 +146,7 @@ FTRACE_OPS_FL_RECURSION_SAFE
        itself or any nested functions that those functions call.
 
        If this flag is set, it is possible that the callback will also
-       be called with preemption enabled (when CONFIG_PREEMPT is set),
+       be called with preemption enabled (when CONFIG_PREEMPTION is set),
        but this is not guaranteed.
 
 FTRACE_OPS_FL_IPMODIFY

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index f093a43..db7d06a 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3726,6 +3726,8 @@ print_trace_header(struct seq_file *m, struct trace_iterator *iter)
                   "desktop",
 #elif defined(CONFIG_PREEMPT)
                   "preempt",
+#elif defined(CONFIG_PREEMPT_RT)
+                  "preempt_rt",
 #else
                   "unknown",
 #endif