mirror of
https://github.com/OpenVoiceOS/OpenVoiceOS
synced 2025-06-05 22:19:21 +02:00
[All] (testing) Bumpe kernel to 6.6.14
This commit is contained in:
@@ -0,0 +1,38 @@
|
||||
From e7b04cde99332125676409d38687ba8d54d64899 Mon Sep 17 00:00:00 2001
|
||||
From: John Ogness <john.ogness@linutronix.de>
|
||||
Date: Fri, 22 Sep 2023 14:31:09 +0000
|
||||
Subject: [PATCH 155/195] tty: sysfs: Add nbcon support for 'active'
|
||||
|
||||
Allow the 'active' attribute to list nbcon consoles.
|
||||
|
||||
Signed-off-by: John Ogness <john.ogness@linutronix.de>
|
||||
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
---
|
||||
drivers/tty/tty_io.c | 11 +++++++++--
|
||||
1 file changed, 9 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
|
||||
index 493fc4742895..afa52883c498 100644
|
||||
--- a/drivers/tty/tty_io.c
|
||||
+++ b/drivers/tty/tty_io.c
|
||||
@@ -3543,8 +3543,15 @@ static ssize_t show_cons_active(struct device *dev,
|
||||
for_each_console(c) {
|
||||
if (!c->device)
|
||||
continue;
|
||||
- if (!c->write)
|
||||
- continue;
|
||||
+ if (c->flags & CON_NBCON) {
|
||||
+ if (!c->write_atomic &&
|
||||
+ !(c->write_thread && c->kthread)) {
|
||||
+ continue;
|
||||
+ }
|
||||
+ } else {
|
||||
+ if (!c->write)
|
||||
+ continue;
|
||||
+ }
|
||||
if ((c->flags & CON_ENABLED) == 0)
|
||||
continue;
|
||||
cs[i++] = c;
|
||||
--
|
||||
2.43.0
|
||||
|
Reference in New Issue
Block a user