49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
From 8847531d9096f4c400156e67aacf15f1dac79db1 Mon Sep 17 00:00:00 2001
|
|
From: John Ogness <john.ogness@linutronix.de>
|
|
Date: Tue, 12 Sep 2023 13:53:21 +0000
|
|
Subject: [PATCH 132/196] printk: Let console_is_usable() handle nbcon
|
|
|
|
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(-)
|
|
|
|
diff --git a/kernel/printk/internal.h b/kernel/printk/internal.h
|
|
index 378ccca007ca..d741d19bb9db 100644
|
|
--- 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(struct console *con)
|
|
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
|
|
--
|
|
2.43.2
|
|
|