summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0114-rt-Increase-decrease-the-nr-of-migratory-tasks-when-.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/0114-rt-Increase-decrease-the-nr-of-migratory-tasks-when-.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/0114-rt-Increase-decrease-the-nr-of-migratory-tasks-when-.patch')
-rw-r--r--debian/patches-rt/0114-rt-Increase-decrease-the-nr-of-migratory-tasks-when-.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches-rt/0114-rt-Increase-decrease-the-nr-of-migratory-tasks-when-.patch b/debian/patches-rt/0114-rt-Increase-decrease-the-nr-of-migratory-tasks-when-.patch
index 40b318eb7..26a09df27 100644
--- a/debian/patches-rt/0114-rt-Increase-decrease-the-nr-of-migratory-tasks-when-.patch
+++ b/debian/patches-rt/0114-rt-Increase-decrease-the-nr-of-migratory-tasks-when-.patch
@@ -1,8 +1,8 @@
From: Daniel Bristot de Oliveira <bristot@redhat.com>
Date: Mon, 26 Jun 2017 17:07:15 +0200
-Subject: [PATCH 114/342] rt: Increase/decrease the nr of migratory tasks when
+Subject: [PATCH 114/351] rt: Increase/decrease the nr of migratory tasks when
enabling/disabling migration
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=7cec25c101288e60f1ff32098dcf7f6ddb34cce0
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=f12714dbfa30e40ef8023d652f115cb6ff2ad99d
There is a problem in the migrate_disable()/enable() implementation
regarding the number of migratory tasks in the rt/dl RQs. The problem
@@ -81,10 +81,10 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
1 file changed, 44 insertions(+), 5 deletions(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index dadf92046f01..ba6f445ac9e8 100644
+index 54f22c835740..7b4752fa34d1 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
-@@ -7179,6 +7179,47 @@ const u32 sched_prio_to_wmult[40] = {
+@@ -7180,6 +7180,47 @@ const u32 sched_prio_to_wmult[40] = {
#if defined(CONFIG_PREEMPT_COUNT) && defined(CONFIG_SMP)
@@ -132,7 +132,7 @@ index dadf92046f01..ba6f445ac9e8 100644
void migrate_disable(void)
{
struct task_struct *p = current;
-@@ -7202,10 +7243,9 @@ void migrate_disable(void)
+@@ -7203,10 +7244,9 @@ void migrate_disable(void)
}
preempt_disable();
@@ -145,7 +145,7 @@ index dadf92046f01..ba6f445ac9e8 100644
preempt_enable();
}
-@@ -7237,9 +7277,8 @@ void migrate_enable(void)
+@@ -7238,9 +7278,8 @@ void migrate_enable(void)
preempt_disable();