summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0187-net-Properly-annotate-the-try-lock-for-the-seqlock.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 17:45:38 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 17:46:06 +0000
commit30c4ae2eedacfbb99ce91d04f6232e7c26e498dd (patch)
tree968a4e3149e28312eb427de8cdfc970ad5a8cffb /debian/patches-rt/0187-net-Properly-annotate-the-try-lock-for-the-seqlock.patch
parentMerging upstream version 5.10.216. (diff)
downloadlinux-30c4ae2eedacfbb99ce91d04f6232e7c26e498dd.tar.xz
linux-30c4ae2eedacfbb99ce91d04f6232e7c26e498dd.zip
Merging debian version 5.10.216-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0187-net-Properly-annotate-the-try-lock-for-the-seqlock.patch')
-rw-r--r--debian/patches-rt/0187-net-Properly-annotate-the-try-lock-for-the-seqlock.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches-rt/0187-net-Properly-annotate-the-try-lock-for-the-seqlock.patch b/debian/patches-rt/0187-net-Properly-annotate-the-try-lock-for-the-seqlock.patch
index 130a8cb78..59fbf26a2 100644
--- a/debian/patches-rt/0187-net-Properly-annotate-the-try-lock-for-the-seqlock.patch
+++ b/debian/patches-rt/0187-net-Properly-annotate-the-try-lock-for-the-seqlock.patch
@@ -1,8 +1,8 @@
-From 442e014107fc616d529c73b0f0436980b817d021 Mon Sep 17 00:00:00 2001
+From 1bb2d66a2859bcb94d1fb58b0e2facdbf01335d1 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Tue, 8 Sep 2020 16:57:11 +0200
Subject: [PATCH 187/323] net: Properly annotate the try-lock for the seqlock
-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
In patch
("net/Qdisc: use a seqlock instead seqcount")
@@ -25,7 +25,7 @@ Signed-off-by: Luis Claudio R. Goncalves <lgoncalv@redhat.com>
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/include/net/net_seq_lock.h b/include/net/net_seq_lock.h
-index 95a497a72e51..67710bace741 100644
+index 95a497a72e511..67710bace7418 100644
--- a/include/net/net_seq_lock.h
+++ b/include/net/net_seq_lock.h
@@ -6,15 +6,6 @@
@@ -45,7 +45,7 @@ index 95a497a72e51..67710bace741 100644
# define net_seqlock_t seqcount_t
# define net_seq_begin(__r) read_seqcount_begin(__r)
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
-index 8ce663a9b4f4..eee11a1c9321 100644
+index 8ce663a9b4f45..eee11a1c93216 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -189,8 +189,16 @@ static inline bool qdisc_run_begin(struct Qdisc *qdisc)
@@ -67,5 +67,5 @@ index 8ce663a9b4f4..eee11a1c9321 100644
#else
/* Variant of write_seqcount_begin() telling lockdep a trylock
--
-2.43.0
+2.44.0