Konstantin Demin
c3d09a3e94
imported from https://salsa.debian.org/kernel-team/linux.git commit 9d5cc9d9d6501d7f1dd7e194d4b245bd0b6c6a22 version 6.11.4-1
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From: John Ogness <john.ogness@linutronix.de>
|
|
Date: Wed, 4 Sep 2024 14:11:32 +0206
|
|
Subject: [PATCH 50/54] proc: Add nbcon support for /proc/consoles
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.11/older/patches-6.11-rt7.tar.xz
|
|
|
|
Update /proc/consoles output to show 'W' if an nbcon console is
|
|
registered. Since the write_thread() callback is mandatory, it
|
|
enough just to check if it is an nbcon console.
|
|
|
|
Also update /proc/consoles output to show 'N' if it is an
|
|
nbcon console.
|
|
|
|
Signed-off-by: John Ogness <john.ogness@linutronix.de>
|
|
Reviewed-by: Petr Mladek <pmladek@suse.com>
|
|
Link: https://lore.kernel.org/r/20240904120536.115780-14-john.ogness@linutronix.de
|
|
Signed-off-by: Petr Mladek <pmladek@suse.com>
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
fs/proc/consoles.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
--- a/fs/proc/consoles.c
|
|
+++ b/fs/proc/consoles.c
|
|
@@ -21,6 +21,7 @@ static int show_console_dev(struct seq_f
|
|
{ CON_ENABLED, 'E' },
|
|
{ CON_CONSDEV, 'C' },
|
|
{ CON_BOOT, 'B' },
|
|
+ { CON_NBCON, 'N' },
|
|
{ CON_PRINTBUFFER, 'p' },
|
|
{ CON_BRL, 'b' },
|
|
{ CON_ANYTIME, 'a' },
|
|
@@ -58,8 +59,8 @@ static int show_console_dev(struct seq_f
|
|
seq_printf(m, "%s%d", con->name, con->index);
|
|
seq_pad(m, ' ');
|
|
seq_printf(m, "%c%c%c (%s)", con->read ? 'R' : '-',
|
|
- con->write ? 'W' : '-', con->unblank ? 'U' : '-',
|
|
- flags);
|
|
+ ((con->flags & CON_NBCON) || con->write) ? 'W' : '-',
|
|
+ con->unblank ? 'U' : '-', flags);
|
|
if (dev)
|
|
seq_printf(m, " %4d:%d", MAJOR(dev), MINOR(dev));
|
|
|