From f25552c1068a054f2d99afd67a671d5991bf19c1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 7 Aug 2024 15:11:44 +0200 Subject: Merging debian version 6.9.7-1. Signed-off-by: Daniel Baumann --- ...printk-Let-console_is_usable-handle-nbcon.patch | 43 ---------------------- 1 file changed, 43 deletions(-) delete mode 100644 debian/patches-rt/0018-printk-Let-console_is_usable-handle-nbcon.patch (limited to 'debian/patches-rt/0018-printk-Let-console_is_usable-handle-nbcon.patch') diff --git a/debian/patches-rt/0018-printk-Let-console_is_usable-handle-nbcon.patch b/debian/patches-rt/0018-printk-Let-console_is_usable-handle-nbcon.patch deleted file mode 100644 index 6d995e7020..0000000000 --- a/debian/patches-rt/0018-printk-Let-console_is_usable-handle-nbcon.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: John Ogness -Date: Tue, 12 Sep 2023 13:53:21 +0000 -Subject: [PATCH 18/48] printk: Let console_is_usable() handle nbcon -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.8/older/patches-6.8.2-rt11.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