summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0002-hrtimer-Don-t-grab-the-expiry-lock-for-non-soft-hrti.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0002-hrtimer-Don-t-grab-the-expiry-lock-for-non-soft-hrti.patch')
-rw-r--r--debian/patches-rt/0002-hrtimer-Don-t-grab-the-expiry-lock-for-non-soft-hrti.patch31
1 files changed, 0 insertions, 31 deletions
diff --git a/debian/patches-rt/0002-hrtimer-Don-t-grab-the-expiry-lock-for-non-soft-hrti.patch b/debian/patches-rt/0002-hrtimer-Don-t-grab-the-expiry-lock-for-non-soft-hrti.patch
deleted file mode 100644
index 63f20d98a..000000000
--- a/debian/patches-rt/0002-hrtimer-Don-t-grab-the-expiry-lock-for-non-soft-hrti.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Julien Grall <julien.grall@arm.com>
-Date: Wed, 21 Aug 2019 10:24:08 +0100
-Subject: [PATCH 2/3] hrtimer: Don't grab the expiry lock for non-soft hrtimer
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.2/older/patches-5.2.17-rt9.tar.xz
-
-Acquiring the lock in hrtimer_grab_expiry_lock() is designed for
-sleeping-locks and should not be used with disabled interrupts.
-hrtimer_cancel() may invoke hrtimer_grab_expiry_lock() also for locks
-which expire in hard-IRQ context.
-
-Let hrtimer_cancel() invoke hrtimer_grab_expiry_lock() only for locks
-which expire in softirq context.
-
-Signed-off-by: Julien Grall <julien.grall@arm.com>
-[bigeasy: rewrite changelog]
-Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
----
- kernel/time/hrtimer.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/kernel/time/hrtimer.c
-+++ b/kernel/time/hrtimer.c
-@@ -934,7 +934,7 @@ void hrtimer_grab_expiry_lock(const stru
- {
- struct hrtimer_clock_base *base = READ_ONCE(timer->base);
-
-- if (base && base->cpu_base) {
-+ if (timer->is_soft && base && base->cpu_base) {
- spin_lock(&base->cpu_base->softirq_expiry_lock);
- spin_unlock(&base->cpu_base->softirq_expiry_lock);
- }