diff options
Diffstat (limited to '')
-rw-r--r-- | debian/patches-rt/0040-printk-nbcon-Add-printer-thread-wakeups.patch (renamed from debian/patches-rt/0124-printk-nbcon-Add-printer-thread-wakeups.patch) | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches-rt/0124-printk-nbcon-Add-printer-thread-wakeups.patch b/debian/patches-rt/0040-printk-nbcon-Add-printer-thread-wakeups.patch index 18e02593f8..89e086aa32 100644 --- a/debian/patches-rt/0124-printk-nbcon-Add-printer-thread-wakeups.patch +++ b/debian/patches-rt/0040-printk-nbcon-Add-printer-thread-wakeups.patch @@ -1,7 +1,7 @@ From: Thomas Gleixner <tglx@linutronix.de> Date: Tue, 26 Sep 2023 13:03:52 +0000 -Subject: [PATCH 124/134] printk: nbcon: Add printer thread wakeups -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.6/older/patches-6.6.7-rt18.tar.xz +Subject: [PATCH 40/50] printk: nbcon: Add printer thread wakeups +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.7/older/patches-6.7-rt6.tar.xz Add a function to wakeup the printer threads. Use the new function when: @@ -34,7 +34,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> #include <linux/rculist.h> #include <linux/rcuwait.h> #include <linux/types.h> -@@ -306,6 +307,7 @@ struct nbcon_write_context { +@@ -313,6 +314,7 @@ struct nbcon_write_context { * @locked_port: True, if the port lock is locked by nbcon * @kthread: Printer kthread for this console * @rcuwait: RCU-safe wait object for @kthread waking @@ -42,7 +42,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> */ struct console { char name[16]; -@@ -339,6 +341,7 @@ struct console { +@@ -346,6 +348,7 @@ struct console { bool locked_port; struct task_struct *kthread; struct rcuwait rcuwait; @@ -134,7 +134,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> } --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c -@@ -2403,6 +2403,8 @@ asmlinkage int vprintk_emit(int facility +@@ -2402,6 +2402,8 @@ asmlinkage int vprintk_emit(int facility } } @@ -143,7 +143,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> if (do_trylock_unlock) { /* * The caller may be holding system-critical or -@@ -2705,6 +2707,10 @@ void resume_console(void) +@@ -2712,6 +2714,10 @@ void resume_console(void) */ synchronize_srcu(&console_srcu); @@ -154,7 +154,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> cookie = console_srcu_read_lock(); for_each_console_srcu(con) { flags = console_srcu_read_flags(con); -@@ -4097,6 +4103,7 @@ void defer_console_output(void) +@@ -4104,6 +4110,7 @@ void defer_console_output(void) void printk_trigger_flush(void) { |