Merge tag 'trace-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[people/ms/linux.git] / kernel / trace / trace.c

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index f400800bc910d9c1a44c3b1652e34cf56c723a57..2c95992e2c71072d5d501ce139178a25531f4945 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -4290,17 +4290,11 @@ print_trace_header(struct seq_file *m, struct trace_iterator *iter)
                   entries,
                   total,
                   buf->cpu,
-#if defined(CONFIG_PREEMPT_NONE)
-                  "server",
-#elif defined(CONFIG_PREEMPT_VOLUNTARY)
-                  "desktop",
-#elif defined(CONFIG_PREEMPT)
-                  "preempt",
-#elif defined(CONFIG_PREEMPT_RT)
-                  "preempt_rt",
-#else
+                  preempt_model_none()      ? "server" :
+                  preempt_model_voluntary() ? "desktop" :
+                  preempt_model_full()      ? "preempt" :
+                  preempt_model_rt()        ? "preempt_rt" :
                   "unknown",
-#endif
                   /* These are reserved for later use */
                   0, 0, 0, 0);
 #ifdef CONFIG_SMP