summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0308-sched-migrate_enable-Use-stop_one_cpu_nowait.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0308-sched-migrate_enable-Use-stop_one_cpu_nowait.patch')
-rw-r--r--debian/patches-rt/0308-sched-migrate_enable-Use-stop_one_cpu_nowait.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches-rt/0308-sched-migrate_enable-Use-stop_one_cpu_nowait.patch b/debian/patches-rt/0308-sched-migrate_enable-Use-stop_one_cpu_nowait.patch
index 306caf6c4..6bb640a4b 100644
--- a/debian/patches-rt/0308-sched-migrate_enable-Use-stop_one_cpu_nowait.patch
+++ b/debian/patches-rt/0308-sched-migrate_enable-Use-stop_one_cpu_nowait.patch
@@ -1,7 +1,7 @@
From: Scott Wood <swood@redhat.com>
Date: Sat, 12 Oct 2019 01:52:14 -0500
-Subject: [PATCH 308/342] sched: migrate_enable: Use stop_one_cpu_nowait()
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=519fb3634f6b249f1ffe9e72c3df31ac00b7797e
+Subject: [PATCH 308/351] sched: migrate_enable: Use stop_one_cpu_nowait()
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=1c8f8380a7031358ac5fc4177bbbe5d03bc6cfd2
[ Upstream commit 6b39a1fa8c53cae08dc03afdae193b7d3a78a173 ]
@@ -34,7 +34,7 @@ index ccdaa8fd5657..150e886ed83d 100644
int stop_one_cpu(unsigned int cpu, cpu_stop_fn_t fn, void *arg);
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index de6514e13e0c..dff9d26a8625 100644
+index a2c0f199f362..eeb53ea1483c 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -990,6 +990,7 @@ static struct rq *move_queued_task(struct rq *rq, struct rq_flags *rf,
@@ -69,7 +69,7 @@ index de6514e13e0c..dff9d26a8625 100644
}
rq_unlock(rq, &rf);
raw_spin_unlock(&p->pi_lock);
-@@ -7316,6 +7322,7 @@ void migrate_enable(void)
+@@ -7317,6 +7323,7 @@ void migrate_enable(void)
WARN_ON(smp_processor_id() != cpu);
if (!is_cpu_allowed(p, cpu)) {
struct migration_arg arg = { p };
@@ -77,7 +77,7 @@ index de6514e13e0c..dff9d26a8625 100644
struct rq_flags rf;
rq = task_rq_lock(p, &rf);
-@@ -7323,15 +7330,11 @@ void migrate_enable(void)
+@@ -7324,15 +7331,11 @@ void migrate_enable(void)
arg.dest_cpu = select_fallback_rq(cpu, p);
task_rq_unlock(rq, p, &rf);