diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 17:40:22 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 17:44:43 +0000 |
commit | b5b67adcc17e3e74dbcda09ff3f8a4636aa53486 (patch) | |
tree | 601c346183757b42c53b1d0aa8773cb00d1bd73c /debian/patches-rt/0025-printk-Track-registered-boot-consoles.patch | |
parent | Merging upstream version 6.7.7. (diff) | |
download | linux-b5b67adcc17e3e74dbcda09ff3f8a4636aa53486.tar.xz linux-b5b67adcc17e3e74dbcda09ff3f8a4636aa53486.zip |
Merging debian version 6.7.7-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | debian/patches-rt/0025-printk-Track-registered-boot-consoles.patch (renamed from debian/patches-rt/0109-printk-Track-registered-boot-consoles.patch) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches-rt/0109-printk-Track-registered-boot-consoles.patch b/debian/patches-rt/0025-printk-Track-registered-boot-consoles.patch index 51b866f20f..5c35ea115c 100644 --- a/debian/patches-rt/0109-printk-Track-registered-boot-consoles.patch +++ b/debian/patches-rt/0025-printk-Track-registered-boot-consoles.patch @@ -1,7 +1,7 @@ From: John Ogness <john.ogness@linutronix.de> Date: Tue, 24 Oct 2023 14:13:14 +0000 -Subject: [PATCH 109/134] printk: Track registered boot consoles -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.6/older/patches-6.6.7-rt18.tar.xz +Subject: [PATCH 25/50] printk: Track registered boot consoles +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.7/older/patches-6.7-rt6.tar.xz Unfortunately it is not known if a boot console and a regular (legacy or nbcon) console use the same hardware. For this reason @@ -39,7 +39,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> #ifdef CONFIG_PRINTK DECLARE_WAIT_QUEUE_HEAD(log_wait); /* All 3 protected by @syslog_lock. */ -@@ -3500,6 +3508,9 @@ void register_console(struct console *ne +@@ -3507,6 +3515,9 @@ void register_console(struct console *ne if (newcon->flags & CON_NBCON) nbcon_init(newcon); @@ -49,7 +49,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> /* * Put this console in the list - keep the * preferred driver at the head of the list. -@@ -3552,6 +3563,8 @@ EXPORT_SYMBOL(register_console); +@@ -3559,6 +3570,8 @@ EXPORT_SYMBOL(register_console); /* Must be called under console_list_lock(). */ static int unregister_console_locked(struct console *console) { @@ -58,7 +58,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> int res; lockdep_assert_console_list_lock_held(); -@@ -3599,6 +3612,17 @@ static int unregister_console_locked(str +@@ -3606,6 +3619,17 @@ static int unregister_console_locked(str if (console->exit) res = console->exit(console); |