summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0024-printk-Coordinate-direct-printing-in-panic.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0024-printk-Coordinate-direct-printing-in-panic.patch')
-rw-r--r--debian/patches-rt/0024-printk-Coordinate-direct-printing-in-panic.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/debian/patches-rt/0024-printk-Coordinate-direct-printing-in-panic.patch b/debian/patches-rt/0024-printk-Coordinate-direct-printing-in-panic.patch
index eb17ba5098..c318b1ee55 100644
--- a/debian/patches-rt/0024-printk-Coordinate-direct-printing-in-panic.patch
+++ b/debian/patches-rt/0024-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 24/46] printk: Coordinate direct printing in panic
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.9/older/patches-6.9-rt5.tar.xz
+Subject: [PATCH 24/48] printk: Coordinate direct printing in panic
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.10/older/patches-6.10.2-rt14.tar.xz
Perform printing by nbcon consoles on the panic CPU from the
printk() caller context in order to get panic messages printed
@@ -28,15 +28,15 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
-@@ -195,6 +195,7 @@ void show_regs_print_info(const char *lo
- extern asmlinkage void dump_stack_lvl(const char *log_lvl) __cold;
+@@ -196,6 +196,7 @@ extern asmlinkage void dump_stack_lvl(co
extern asmlinkage void dump_stack(void) __cold;
void printk_trigger_flush(void);
+ void console_replay_all(void);
+void printk_legacy_allow_panic_sync(void);
- extern bool nbcon_driver_try_acquire(struct console *con);
- extern void nbcon_driver_release(struct console *con);
+ extern bool nbcon_device_try_acquire(struct console *con);
+ extern void nbcon_device_release(struct console *con);
void nbcon_atomic_flush_unsafe(void);
-@@ -278,6 +279,10 @@ static inline void printk_trigger_flush(
+@@ -283,6 +284,10 @@ static inline void console_replay_all(vo
{
}
@@ -44,12 +44,12 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+{
+}
+
- static inline bool nbcon_driver_try_acquire(struct console *con)
+ static inline bool nbcon_device_try_acquire(struct console *con)
{
return false;
--- a/kernel/panic.c
+++ b/kernel/panic.c
-@@ -368,6 +368,8 @@ void panic(const char *fmt, ...)
+@@ -367,6 +367,8 @@ void panic(const char *fmt, ...)
panic_other_cpus_shutdown(_crash_kexec_post_notifiers);