summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0106-printk-Let-console_is_usable-handle-nbcon.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0106-printk-Let-console_is_usable-handle-nbcon.patch')
-rw-r--r--debian/patches-rt/0106-printk-Let-console_is_usable-handle-nbcon.patch43
1 files changed, 0 insertions, 43 deletions
diff --git a/debian/patches-rt/0106-printk-Let-console_is_usable-handle-nbcon.patch b/debian/patches-rt/0106-printk-Let-console_is_usable-handle-nbcon.patch
deleted file mode 100644
index 62a776cf2f..0000000000
--- a/debian/patches-rt/0106-printk-Let-console_is_usable-handle-nbcon.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: John Ogness <john.ogness@linutronix.de>
-Date: Tue, 12 Sep 2023 13:53:21 +0000
-Subject: [PATCH 106/134] printk: Let console_is_usable() handle nbcon
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.6/older/patches-6.6.7-rt18.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 <john.ogness@linutronix.de>
-Reviewed-by: Petr Mladek <pmladek@suse.com>
-Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
----
- kernel/printk/internal.h | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
---- a/kernel/printk/internal.h
-+++ b/kernel/printk/internal.h
-@@ -80,6 +80,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.
-@@ -94,8 +96,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