summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0050-printk-Avoid-false-positive-lockdep-report-for-legac.patch
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/patches-rt/0050-printk-Avoid-false-positive-lockdep-report-for-legac.patch (renamed from debian/patches-rt/0134-printk-Avoid-false-positive-lockdep-report-for-legac.patch)14
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches-rt/0134-printk-Avoid-false-positive-lockdep-report-for-legac.patch b/debian/patches-rt/0050-printk-Avoid-false-positive-lockdep-report-for-legac.patch
index 225e8db694..7c9f453664 100644
--- a/debian/patches-rt/0134-printk-Avoid-false-positive-lockdep-report-for-legac.patch
+++ b/debian/patches-rt/0050-printk-Avoid-false-positive-lockdep-report-for-legac.patch
@@ -1,8 +1,8 @@
From: John Ogness <john.ogness@linutronix.de>
Date: Mon, 11 Dec 2023 09:34:16 +0000
-Subject: [PATCH 134/134] printk: Avoid false positive lockdep report for
- legacy driver.
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.6/older/patches-6.6.7-rt18.tar.xz
+Subject: [PATCH 50/50] printk: Avoid false positive lockdep report for legacy
+ driver.
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.7/older/patches-6.7-rt6.tar.xz
printk may invoke the legacy console driver from atomic context. This leads to
a lockdep splat because the console driver will acquire a sleeping lock and the
@@ -23,7 +23,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
-@@ -2817,6 +2817,8 @@ static void __console_unlock(void)
+@@ -2824,6 +2824,8 @@ static void __console_unlock(void)
up_console_sem();
}
@@ -32,7 +32,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
#ifdef CONFIG_PRINTK
/*
-@@ -2985,7 +2987,7 @@ static bool console_emit_next_record(str
+@@ -2992,7 +2994,7 @@ static bool console_emit_next_record(str
/*
* On PREEMPT_RT this function is either in a thread or
* panic context. So there is no need for concern about
@@ -41,7 +41,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
*/
con->write(con, outbuf, pmsg.outbuf_len);
-@@ -3007,7 +3009,9 @@ static bool console_emit_next_record(str
+@@ -3014,7 +3016,9 @@ static bool console_emit_next_record(str
/* Do not trace print latency. */
stop_critical_timings();
@@ -51,7 +51,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
start_critical_timings();
-@@ -3084,7 +3088,10 @@ static bool console_flush_all(bool do_co
+@@ -3091,7 +3095,10 @@ static bool console_flush_all(bool do_co
any_usable = true;
if (flags & CON_NBCON) {