v4.14.232-rt112-rc1 stable review patch.
If anyone has any objections, please let me know.
-----------
Commit 7fcfb8fdfc41e ("printk: Make rt aware") from v4.19-rt is more
comprehensive than its equivalent in v4.14-rt (commit 70ce7ac4c16f1).
As one example, this commit resolves the following build warnings from
v4.14-rt:
kernel/printk/printk.c: At top level:
kernel/printk/printk.c:1608:13: warning: ‘console_lock_spinning_enable’ defined but not used [-Wunused-function]
static void console_lock_spinning_enable(void)
^
kernel/printk/printk.c:1633:12: warning: ‘console_lock_spinning_disable_and_check’ defined but not used [-Wunused-function]
static int console_lock_spinning_disable_and_check(void)
^
Fixes: 70ce7ac4c16f1 ("printk: Make rt aware")
Signed-off-by: Luis Claudio R. Goncalves <lgoncalv@xxxxxxxxxx>
---
kernel/printk/printk.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 624ba7bb74374..fdae4fbd8a127 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -1581,6 +1581,7 @@ SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len)
return do_syslog(type, buf, len, SYSLOG_FROM_READER);
}
+#ifndef CONFIG_PREEMPT_RT_FULL
/*
* Special console_lock variants that help to reduce the risk of soft-lockups.
* They allow to pass console_lock to another printk() call using a busy wait.
@@ -1721,6 +1722,15 @@ static int console_trylock_spinning(void)
return 1;
}
+#else
+
+static int console_trylock_spinning(void)
+{
+ return console_trylock();
+}
+
+#endif
+
/*
* Call the console drivers, asking them to write out
* log_buf[start] to log_buf[end - 1].
@@ -2855,6 +2865,7 @@ static int __init printk_late_init(void)
struct console *con;
int ret;
+ migrate_disable();
for_each_console(con) {
if (!(con->flags & CON_BOOT))
continue;
--
2.31.1
