summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0324-hrtimer-fix-logic-for-when-grabbing-softirq_expiry_l.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 04:15:16 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 04:15:28 +0000
commit0cf6719e1d2f19f831279583065810ceb5ecbd28 (patch)
tree34052095977dde7bec44b99f60acc8bb77325f76 /debian/patches-rt/0324-hrtimer-fix-logic-for-when-grabbing-softirq_expiry_l.patch
parentMerging upstream version 4.19.282. (diff)
downloadlinux-0cf6719e1d2f19f831279583065810ceb5ecbd28.tar.xz
linux-0cf6719e1d2f19f831279583065810ceb5ecbd28.zip
Merging debian version 4.19.282-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0324-hrtimer-fix-logic-for-when-grabbing-softirq_expiry_l.patch')
-rw-r--r--debian/patches-rt/0324-hrtimer-fix-logic-for-when-grabbing-softirq_expiry_l.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches-rt/0324-hrtimer-fix-logic-for-when-grabbing-softirq_expiry_l.patch b/debian/patches-rt/0324-hrtimer-fix-logic-for-when-grabbing-softirq_expiry_l.patch
index 835a8530f..966832270 100644
--- a/debian/patches-rt/0324-hrtimer-fix-logic-for-when-grabbing-softirq_expiry_l.patch
+++ b/debian/patches-rt/0324-hrtimer-fix-logic-for-when-grabbing-softirq_expiry_l.patch
@@ -1,8 +1,8 @@
From: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Date: Tue, 28 Apr 2020 16:40:26 +0200
-Subject: [PATCH 324/351] hrtimer: fix logic for when grabbing
+Subject: [PATCH 324/353] hrtimer: fix logic for when grabbing
softirq_expiry_lock can be elided
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=36b0eadf58daa2135f9139436ccfd778db315f0f
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=fc7f9dff54b6992d49ccd4c8d5f094fd89c17a46
Commit
@@ -32,7 +32,7 @@ Signed-off-by: Tom Zanussi <zanussi@kernel.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
-index 0f841f18c363..a84673149881 100644
+index 3a5e258c243a..a522cebdaa21 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -971,7 +971,7 @@ void hrtimer_grab_expiry_lock(const struct hrtimer *timer)