Commit 089c02ae authored by Valentin Schneider's avatar Valentin Schneider Committed by Peter Zijlstra
Browse files

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: default avatarValentin Schneider <valentin.schneider@arm.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
Acked-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/r/20211112185203.280040-5-valentin.schneider@arm.com
parent 5693fa74

kernel/trace/trace.c

+4 −10
Original line number Diff line number Diff line
@@ -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