From: Clark Williams <clrkwllms@kernel.org>
To: rostedt@goodmis.org
Cc: bigeasy@linutronix.de, linux-rt-users@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] tracing: fix compile failure on RT with PREEMPT_RT off
Date: Sat, 10 Oct 2020 16:45:54 -0500 [thread overview]
Message-ID: <20201010214554.389157-1-clrkwllms@kernel.org> (raw)
This patch is against v5.9-rc8-rt14
Fix a compile issue when CONFIG_PREEMPT_RT is not defined. If
we're not on an RT kernel, just set the migration disabled
status to zero.
Signed-off-by: Clark Williams <clrkwllms@kernel.org>
---
kernel/trace/trace.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index aa7f3bef6d4f..896573d39baf 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -2437,6 +2437,16 @@ enum print_line_t trace_handle_return(struct trace_seq *s)
}
EXPORT_SYMBOL_GPL(trace_handle_return);
+static inline unsigned short
+migration_disable_value(struct task_struct *tsk)
+{
+#if defined(CONFIG_SMP) && defined(CONFIG_PREEMPT_RT)
+ return (tsk) ? tsk->migration_disabled : 0;
+#else
+ return 0;
+#endif
+}
+
void
tracing_generic_entry_update(struct trace_entry *entry, unsigned short type,
unsigned long flags, int pc)
@@ -2460,7 +2470,7 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned short type,
(need_resched_lazy() ? TRACE_FLAG_NEED_RESCHED_LAZY : 0) |
(test_preempt_need_resched() ? TRACE_FLAG_PREEMPT_RESCHED : 0);
- entry->migrate_disable = (tsk) ? tsk->migration_disabled & 0xFF : 0;
+ entry->migrate_disable = migration_disable_value(tsk) & 0xFF : 0;
}
EXPORT_SYMBOL_GPL(tracing_generic_entry_update);
--
2.28.0
next reply other threads:[~2020-10-10 23:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-10 21:45 Clark Williams [this message]
2020-10-12 10:12 ` [PATCH] tracing: fix compile failure on RT with PREEMPT_RT off Sebastian Andrzej Siewior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201010214554.389157-1-clrkwllms@kernel.org \
--to=clrkwllms@kernel.org \
--cc=bigeasy@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.