summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0087-printk-use-seqcount_latch-for-clear_seq.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0087-printk-use-seqcount_latch-for-clear_seq.patch')
-rw-r--r--debian/patches-rt/0087-printk-use-seqcount_latch-for-clear_seq.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches-rt/0087-printk-use-seqcount_latch-for-clear_seq.patch b/debian/patches-rt/0087-printk-use-seqcount_latch-for-clear_seq.patch
index f34000021..2dfd9bc86 100644
--- a/debian/patches-rt/0087-printk-use-seqcount_latch-for-clear_seq.patch
+++ b/debian/patches-rt/0087-printk-use-seqcount_latch-for-clear_seq.patch
@@ -1,8 +1,8 @@
-From 0b877c3f36fc909dc2aec9f70e2e80ad0c69a60b Mon Sep 17 00:00:00 2001
+From a0d38d824d92325e893d09a8b9bd48e74172917e Mon Sep 17 00:00:00 2001
From: John Ogness <john.ogness@linutronix.de>
Date: Mon, 30 Nov 2020 01:41:58 +0106
Subject: [PATCH 087/323] printk: use seqcount_latch for clear_seq
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.204-rt100.tar.xz
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.215-rt107.tar.xz
kmsg_dump_rewind_nolock() locklessly reads @clear_seq. However,
this is not done atomically. Since @clear_seq is 64-bit, this
@@ -18,7 +18,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
1 file changed, 50 insertions(+), 8 deletions(-)
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
-index 1bc4ff19c0d2..4444b3e292d5 100644
+index 6db3c574e4aa8..d40bc4665f5c0 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -404,8 +404,21 @@ static u64 console_seq;
@@ -124,7 +124,7 @@ index 1bc4ff19c0d2..4444b3e292d5 100644
logbuf_unlock_irq();
}
-@@ -3341,7 +3383,7 @@ void kmsg_dump(enum kmsg_dump_reason reason)
+@@ -3370,7 +3412,7 @@ void kmsg_dump(enum kmsg_dump_reason reason)
dumper->active = true;
logbuf_lock_irqsave(flags);
@@ -133,7 +133,7 @@ index 1bc4ff19c0d2..4444b3e292d5 100644
dumper->next_seq = prb_next_seq(prb);
logbuf_unlock_irqrestore(flags);
-@@ -3539,7 +3581,7 @@ EXPORT_SYMBOL_GPL(kmsg_dump_get_buffer);
+@@ -3568,7 +3610,7 @@ EXPORT_SYMBOL_GPL(kmsg_dump_get_buffer);
*/
void kmsg_dump_rewind_nolock(struct kmsg_dumper *dumper)
{
@@ -143,5 +143,5 @@ index 1bc4ff19c0d2..4444b3e292d5 100644
}
--
-2.43.0
+2.44.0