summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0291-sched-Collate-affine_move_task-stoppers.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/0291-sched-Collate-affine_move_task-stoppers.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/0291-sched-Collate-affine_move_task-stoppers.patch')
-rw-r--r--debian/patches-rt/0291-sched-Collate-affine_move_task-stoppers.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches-rt/0291-sched-Collate-affine_move_task-stoppers.patch b/debian/patches-rt/0291-sched-Collate-affine_move_task-stoppers.patch
index b73fb91be..15cadab32 100644
--- a/debian/patches-rt/0291-sched-Collate-affine_move_task-stoppers.patch
+++ b/debian/patches-rt/0291-sched-Collate-affine_move_task-stoppers.patch
@@ -1,8 +1,8 @@
-From e62b758a0149648256ed0fa194d9e107e294d8aa Mon Sep 17 00:00:00 2001
+From aebf4a48df8de27ad8c21a27c8840b03ce9dbef2 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <peterz@infradead.org>
Date: Tue, 8 Jun 2021 00:37:32 -0400
Subject: [PATCH 291/323] sched: Collate affine_move_task() stoppers
-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
commit 58b1a45086b5f80f2b2842aa7ed0da51a64a302b upstream.
@@ -22,7 +22,7 @@ Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index 31fa925852e5..3130289baf79 100644
+index 31fa925852e5b..3130289baf79d 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2291,30 +2291,23 @@ static int affine_move_task(struct rq *rq, struct task_struct *p, struct rq_flag
@@ -65,5 +65,5 @@ index 31fa925852e5..3130289baf79 100644
if (!is_migration_disabled(p)) {
--
-2.43.0
+2.44.0