summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0013-printk-Avoid-non-panic-CPUs-writing-to-ringbuffer.patch
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/patches-rt/0013-printk-Avoid-non-panic-CPUs-writing-to-ringbuffer.patch (renamed from debian/patches-rt/0097-printk-Avoid-non-panic-CPUs-writing-to-ringbuffer.patch)10
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches-rt/0097-printk-Avoid-non-panic-CPUs-writing-to-ringbuffer.patch b/debian/patches-rt/0013-printk-Avoid-non-panic-CPUs-writing-to-ringbuffer.patch
index 2f5a4ba17d..94aab97fe8 100644
--- a/debian/patches-rt/0097-printk-Avoid-non-panic-CPUs-writing-to-ringbuffer.patch
+++ b/debian/patches-rt/0013-printk-Avoid-non-panic-CPUs-writing-to-ringbuffer.patch
@@ -1,7 +1,7 @@
From: John Ogness <john.ogness@linutronix.de>
Date: Fri, 20 Oct 2023 09:37:05 +0000
-Subject: [PATCH 097/134] printk: Avoid non-panic CPUs writing to ringbuffer
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.6/older/patches-6.6.7-rt18.tar.xz
+Subject: [PATCH 13/50] printk: Avoid non-panic CPUs writing to ringbuffer
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.7/older/patches-6.7-rt6.tar.xz
Commit 13fb0f74d702 ("printk: Avoid livelock with heavy printk
during panic") introduced a mechanism to silence non-panic CPUs
@@ -35,7 +35,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
DECLARE_WAIT_QUEUE_HEAD(log_wait);
/* All 3 protected by @syslog_lock. */
/* the next printk record to read by syslog(READ) or /proc/kmsg */
-@@ -2323,7 +2317,12 @@ asmlinkage int vprintk_emit(int facility
+@@ -2322,7 +2316,12 @@ asmlinkage int vprintk_emit(int facility
if (unlikely(suppress_printk))
return 0;
@@ -49,7 +49,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
return 0;
if (level == LOGLEVEL_SCHED) {
-@@ -2800,8 +2799,6 @@ void console_prepend_dropped(struct prin
+@@ -2807,8 +2806,6 @@ void console_prepend_dropped(struct prin
bool printk_get_next_message(struct printk_message *pmsg, u64 seq,
bool is_extended, bool may_suppress)
{
@@ -58,7 +58,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
struct printk_buffers *pbufs = pmsg->pbufs;
const size_t scratchbuf_sz = sizeof(pbufs->scratchbuf);
const size_t outbuf_sz = sizeof(pbufs->outbuf);
-@@ -2829,17 +2826,6 @@ bool printk_get_next_message(struct prin
+@@ -2836,17 +2833,6 @@ bool printk_get_next_message(struct prin
pmsg->seq = r.info->seq;
pmsg->dropped = r.info->seq - seq;