diff options
| author | Valentin Schneider <valentin.schneider@arm.com> | 2021-11-12 19:52:03 +0100 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2022-04-05 10:24:42 +0200 |
| commit | 089c02ae2771a14af2928c59c56abfb9b885a8d7 (patch) | |
| tree | 851f9fdf5a75998cae086a122f8a2f4574d90e69 /kernel/trace | |
| parent | kcsan: Use preemption model accessors (diff) | |
| download | linux-089c02ae2771a14af2928c59c56abfb9b885a8d7.tar.xz linux-089c02ae2771a14af2928c59c56abfb9b885a8d7.zip | |
ftrace: Use preemption model accessors for trace header printout
Per PREEMPT_DYNAMIC, checking CONFIG_PREEMPT doesn't tell you the actual
preemption model of the live kernel. Use the newly-introduced accessors
instead.
Signed-off-by: Valentin Schneider <valentin.schneider@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Acked-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/r/20211112185203.280040-5-valentin.schneider@arm.com
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index f4de111fa18f..124f1897fd56 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -4289,17 +4289,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 |