[tip: sched/core] tracing: Use preempt_model_str()
From: tip-bot2 for Sebastian Andrzej Siewior
Date: Mon Mar 17 2025 - 06:37:38 EST
The following commit has been merged into the sched/core branch of tip:
Commit-ID: 3bffa47a02636ed4134d558caecd35e92051e48d
Gitweb: https://git.kernel.org/tip/3bffa47a02636ed4134d558caecd35e92051e48d
Author: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
AuthorDate: Fri, 14 Mar 2025 17:08:10 +01:00
Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
CommitterDate: Mon, 17 Mar 2025 11:23:41 +01:00
tracing: Use preempt_model_str()
Use preempt_model_str() instead of manually conducting the preemption
model.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Acked-by: "Steven Rostedt (Google)" <rostedt@xxxxxxxxxxx>
Link: https://lore.kernel.org/r/20250314160810.2373416-10-bigeasy@xxxxxxxxxxxxx
---
kernel/trace/trace.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 0e6d517..fd3cb2b 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -4100,12 +4100,7 @@ print_trace_header(struct seq_file *m, struct trace_iterator *iter)
entries,
total,
buf->cpu,
- preempt_model_none() ? "server" :
- preempt_model_voluntary() ? "desktop" :
- preempt_model_full() ? "preempt" :
- preempt_model_lazy() ? "lazy" :
- preempt_model_rt() ? "preempt_rt" :
- "unknown",
+ preempt_model_str(),
/* These are reserved for later use */
0, 0, 0, 0);
#ifdef CONFIG_SMP