diff options
Diffstat (limited to '')
| -rw-r--r-- | debian/patches-rt/0023-printk-Track-nbcon-consoles.patch (renamed from debian/patches-rt/0026-printk-Track-nbcon-consoles.patch) | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/debian/patches-rt/0026-printk-Track-nbcon-consoles.patch b/debian/patches-rt/0023-printk-Track-nbcon-consoles.patch index 7c54a03775..07220890af 100644 --- a/debian/patches-rt/0026-printk-Track-nbcon-consoles.patch +++ b/debian/patches-rt/0023-printk-Track-nbcon-consoles.patch @@ -1,13 +1,14 @@ From: John Ogness <john.ogness@linutronix.de> Date: Mon, 11 Dec 2023 09:36:52 +0000 -Subject: [PATCH 26/48] printk: Track nbcon consoles -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.8/older/patches-6.8.2-rt11.tar.xz +Subject: [PATCH 23/46] printk: Track nbcon consoles +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.9/older/patches-6.9-rt5.tar.xz Add a global flag @have_nbcon_console to identify if any nbcon consoles are registered. This will be used in follow-up commits to preserve legacy behavior when no nbcon consoles are registered. 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/printk.c | 14 +++++++++++++- @@ -27,23 +28,23 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> * Specifies if a boot console is registered. If boot consoles are present, * nbcon consoles cannot print simultaneously and must be synchronized by * the console lock. This is because boot consoles and nbcon consoles may -@@ -3538,6 +3543,7 @@ void register_console(struct console *ne - console_init_seq(newcon, bootcon_registered); +@@ -3552,6 +3557,7 @@ void register_console(struct console *ne + init_seq = get_init_console_seq(newcon, bootcon_registered); if (newcon->flags & CON_NBCON) { + have_nbcon_console = true; - nbcon_init(newcon); - - /* -@@ -3624,6 +3630,7 @@ EXPORT_SYMBOL(register_console); + nbcon_init(newcon, init_seq); + } else { + have_legacy_console = true; +@@ -3631,6 +3637,7 @@ EXPORT_SYMBOL(register_console); static int unregister_console_locked(struct console *console) { bool found_legacy_con = false; + bool found_nbcon_con = false; bool found_boot_con = false; + unsigned long flags; struct console *c; - int res; -@@ -3680,13 +3687,18 @@ static int unregister_console_locked(str +@@ -3698,13 +3705,18 @@ static int unregister_console_locked(str for_each_console(c) { if (c->flags & CON_BOOT) found_boot_con = true; |