summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0031-printk-Coordinate-direct-printing-in-panic.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-18 17:40:22 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-18 17:44:43 +0000
commitb5b67adcc17e3e74dbcda09ff3f8a4636aa53486 (patch)
tree601c346183757b42c53b1d0aa8773cb00d1bd73c /debian/patches-rt/0031-printk-Coordinate-direct-printing-in-panic.patch
parentMerging upstream version 6.7.7. (diff)
downloadlinux-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/0031-printk-Coordinate-direct-printing-in-panic.patch (renamed from debian/patches-rt/0115-printk-Coordinate-direct-printing-in-panic.patch)12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches-rt/0115-printk-Coordinate-direct-printing-in-panic.patch b/debian/patches-rt/0031-printk-Coordinate-direct-printing-in-panic.patch
index 972df76688..6f26bf7fc6 100644
--- a/debian/patches-rt/0115-printk-Coordinate-direct-printing-in-panic.patch
+++ b/debian/patches-rt/0031-printk-Coordinate-direct-printing-in-panic.patch
@@ -1,7 +1,7 @@
From: John Ogness <john.ogness@linutronix.de>
Date: Wed, 22 Nov 2023 11:56:58 +0000
-Subject: [PATCH 115/134] printk: Coordinate direct printing in panic
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.6/older/patches-6.6.7-rt18.tar.xz
+Subject: [PATCH 31/50] printk: Coordinate direct printing in panic
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.7/older/patches-6.7-rt6.tar.xz
Perform printing by nbcon consoles on the panic CPU from the
printk() caller context in order to get panic messages printed
@@ -35,7 +35,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+void printk_legacy_allow_panic_sync(void);
--- a/kernel/panic.c
+++ b/kernel/panic.c
-@@ -366,6 +366,8 @@ void panic(const char *fmt, ...)
+@@ -370,6 +370,8 @@ void panic(const char *fmt, ...)
*/
atomic_notifier_call_chain(&panic_notifier_list, 0, buf);
@@ -46,7 +46,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
kmsg_dump(KMSG_DUMP_PANIC);
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
-@@ -2330,12 +2330,23 @@ int vprintk_store(int facility, int leve
+@@ -2329,12 +2329,23 @@ int vprintk_store(int facility, int leve
return ret;
}
@@ -71,7 +71,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
/* Suppress unimportant messages after panic happens */
if (unlikely(suppress_printk))
-@@ -2351,15 +2362,43 @@ asmlinkage int vprintk_emit(int facility
+@@ -2350,15 +2361,43 @@ asmlinkage int vprintk_emit(int facility
if (level == LOGLEVEL_SCHED) {
level = LOGLEVEL_DEFAULT;
@@ -118,7 +118,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
/*
* The caller may be holding system-critical or
* timing-sensitive locks. Disable preemption during
-@@ -2379,10 +2418,10 @@ asmlinkage int vprintk_emit(int facility
+@@ -2378,10 +2417,10 @@ asmlinkage int vprintk_emit(int facility
preempt_enable();
}