summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0315-sched-migrate_enable-Use-per-cpu-cpu_stop_work.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0315-sched-migrate_enable-Use-per-cpu-cpu_stop_work.patch')
-rw-r--r--debian/patches-rt/0315-sched-migrate_enable-Use-per-cpu-cpu_stop_work.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches-rt/0315-sched-migrate_enable-Use-per-cpu-cpu_stop_work.patch b/debian/patches-rt/0315-sched-migrate_enable-Use-per-cpu-cpu_stop_work.patch
index e14b98f42..28352517c 100644
--- a/debian/patches-rt/0315-sched-migrate_enable-Use-per-cpu-cpu_stop_work.patch
+++ b/debian/patches-rt/0315-sched-migrate_enable-Use-per-cpu-cpu_stop_work.patch
@@ -1,7 +1,7 @@
From: Scott Wood <swood@redhat.com>
Date: Fri, 24 Jan 2020 06:11:46 -0500
-Subject: [PATCH 315/342] sched: migrate_enable: Use per-cpu cpu_stop_work
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=eb1e75f22c7c7fef03f9ff0441ae1e7d7275a470
+Subject: [PATCH 315/351] sched: migrate_enable: Use per-cpu cpu_stop_work
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=a7e94b3eb9610ca7f198abf96699a5d2eab443e7
[ Upstream commit 2dcd94b443c5dcbc20281666321b7f025f9cc85c ]
@@ -29,10 +29,10 @@ Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index d190d9e6b10f..8b946353b1d7 100644
+index 89133dff3161..96edb14cb099 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
-@@ -7285,6 +7285,9 @@ static void migrate_disabled_sched(struct task_struct *p)
+@@ -7286,6 +7286,9 @@ static void migrate_disabled_sched(struct task_struct *p)
p->migrate_disable_scheduled = 1;
}
@@ -42,7 +42,7 @@ index d190d9e6b10f..8b946353b1d7 100644
void migrate_enable(void)
{
struct task_struct *p = current;
-@@ -7323,23 +7326,26 @@ void migrate_enable(void)
+@@ -7324,23 +7327,26 @@ void migrate_enable(void)
WARN_ON(smp_processor_id() != cpu);
if (!is_cpu_allowed(p, cpu)) {