Merging debian version 4.19.269-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 31 insertions, 0 deletions

diff --git a/debian/patches-rt/0344-timers-Keep-interrupts-disabled-for-TIMER_IRQSAFE-ti.patch b/debian/patches-rt/0344-timers-Keep-interrupts-disabled-for-TIMER_IRQSAFE-ti.patch
new file mode 100644
index 000000000..a9e4b14ab
--- /dev/null
+++ b/debian/patches-rt/0344-timers-Keep-interrupts-disabled-for-TIMER_IRQSAFE-ti.patch
@@ -0,0 +1,31 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Fri, 19 Aug 2022 11:24:42 +0200
+Subject: [PATCH 344/351] timers: Keep interrupts disabled for TIMER_IRQSAFE
+ timer.
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=c954214601502e0896ac0b81f1222879dad55393
+
+Keep interrupts disabled across callback invocation for the
+TIMER_IRQSAFE as expected.
+This is required for the timer used by workqueue after the upcomming
+rework.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Signed-off-by: Daniel Wagner <wagi@monom.org>
+---
+ kernel/time/timer.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/kernel/time/timer.c b/kernel/time/timer.c
+index a2be2277506d..3e2c0bd03004 100644
+--- a/kernel/time/timer.c
++++ b/kernel/time/timer.c
+@@ -1397,8 +1397,7 @@ static void expire_timers(struct timer_base *base, struct hlist_head *head)
+ 
+ 		fn = timer->function;
+ 
+-		if (!IS_ENABLED(CONFIG_PREEMPT_RT_FULL) &&
+-		    timer->flags & TIMER_IRQSAFE) {
++		if (timer->flags & TIMER_IRQSAFE) {
+ 			raw_spin_unlock(&base->lock);
+ 			call_timer_fn(timer, fn);
+ 			base->running_timer = NULL;