From 62db400e83102695233497884d16a19c7e34fcd4 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 19 Jun 2024 23:00:54 +0200 Subject: Merging debian version 6.9.2-1~exp1. Signed-off-by: Daniel Baumann --- ...printk-Let-console_is_usable-handle-nbcon.patch | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 debian/patches-rt/0015-printk-Let-console_is_usable-handle-nbcon.patch (limited to 'debian/patches-rt/0015-printk-Let-console_is_usable-handle-nbcon.patch') diff --git a/debian/patches-rt/0015-printk-Let-console_is_usable-handle-nbcon.patch b/debian/patches-rt/0015-printk-Let-console_is_usable-handle-nbcon.patch new file mode 100644 index 000000000..0172326b0 --- /dev/null +++ b/debian/patches-rt/0015-printk-Let-console_is_usable-handle-nbcon.patch @@ -0,0 +1,43 @@ +From: John Ogness +Date: Tue, 12 Sep 2023 13:53:21 +0000 +Subject: [PATCH 15/46] printk: Let console_is_usable() handle nbcon +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.9/older/patches-6.9-rt5.tar.xz + +The nbcon consoles use a different printing callback. For nbcon +consoles, check for the write_atomic() callback instead of +write(). + +Signed-off-by: John Ogness +Reviewed-by: Petr Mladek +Signed-off-by: Sebastian Andrzej Siewior +--- + kernel/printk/internal.h | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +--- a/kernel/printk/internal.h ++++ b/kernel/printk/internal.h +@@ -87,6 +87,8 @@ void nbcon_free(struct console *con); + + /* + * Check if the given console is currently capable and allowed to print ++ * records. Note that this function does not consider the current context, ++ * which can also play a role in deciding if @con can be used to print + * records. + * + * Requires the console_srcu_read_lock. +@@ -101,8 +103,13 @@ static inline bool console_is_usable(str + if ((flags & CON_SUSPENDED)) + return false; + +- if (!con->write) +- return false; ++ if (flags & CON_NBCON) { ++ if (!con->write_atomic) ++ return false; ++ } else { ++ if (!con->write) ++ return false; ++ } + + /* + * Console drivers may assume that per-cpu resources have been -- cgit v1.2.3