summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0269-sched-core-Drop-a-preempt_disable_rt-statement.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 03:44:05 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 03:44:23 +0000
commit38db540ee6930dafa84973fa1c493128ed23d810 (patch)
treee2826f458afdbe0c6d40f534d8bc98dae3db836e /debian/patches-rt/0269-sched-core-Drop-a-preempt_disable_rt-statement.patch
parentMerging upstream version 4.19.269. (diff)
downloadlinux-38db540ee6930dafa84973fa1c493128ed23d810.tar.xz
linux-38db540ee6930dafa84973fa1c493128ed23d810.zip
Merging debian version 4.19.269-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0269-sched-core-Drop-a-preempt_disable_rt-statement.patch')
-rw-r--r--debian/patches-rt/0269-sched-core-Drop-a-preempt_disable_rt-statement.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches-rt/0269-sched-core-Drop-a-preempt_disable_rt-statement.patch b/debian/patches-rt/0269-sched-core-Drop-a-preempt_disable_rt-statement.patch
index a4b7753db..b0a231d28 100644
--- a/debian/patches-rt/0269-sched-core-Drop-a-preempt_disable_rt-statement.patch
+++ b/debian/patches-rt/0269-sched-core-Drop-a-preempt_disable_rt-statement.patch
@@ -1,7 +1,7 @@
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Mon, 24 Jun 2019 19:33:16 +0200
-Subject: [PATCH 269/342] sched/core: Drop a preempt_disable_rt() statement
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=74d2e1a7300ec02a7bea54ed43fbabaa4e8e1193
+Subject: [PATCH 269/351] sched/core: Drop a preempt_disable_rt() statement
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=c3022be56ad0e3024dbedc053260b0773ae09f8d
[ Upstream commit 761126efdcbe3fa3e99c9079fa0ad6eca2f251f2 ]
@@ -15,7 +15,7 @@ Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index feaf4d5683af..3b0f62be3ece 100644
+index f9babcec1afc..5473824aee5b 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -558,14 +558,11 @@ void resched_cpu(int cpu)