This reverts commit 089c02ae2771a14af2928c59c56abfb9b885a8d7. Signed-off-by: Ankur Arora <ankur.a.arora@xxxxxxxxxx> --- kernel/trace/trace.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index abaaf516fcae..7f565f0a00da 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -4392,11 +4392,17 @@ 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_rt() ? "preempt_rt" : +#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 "unknown", +#endif /* These are reserved for later use */ 0, 0, 0, 0); #ifdef CONFIG_SMP -- 2.31.1