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 28352517c..e49addd00 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/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
+Subject: [PATCH 315/353] 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=f7653dc3d53c903cb32c6ecceb3a4bc6904a0718
[ 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 89133dff3161..96edb14cb099 100644
+index 5f9bf8fe8a0e..f60ae431ad64 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
-@@ -7286,6 +7286,9 @@ static void migrate_disabled_sched(struct task_struct *p)
+@@ -7288,6 +7288,9 @@ static void migrate_disabled_sched(struct task_struct *p)
p->migrate_disable_scheduled = 1;
}
@@ -42,7 +42,7 @@ index 89133dff3161..96edb14cb099 100644
void migrate_enable(void)
{
struct task_struct *p = current;
-@@ -7324,23 +7327,26 @@ void migrate_enable(void)
+@@ -7326,23 +7329,26 @@ void migrate_enable(void)
WARN_ON(smp_processor_id() != cpu);
if (!is_cpu_allowed(p, cpu)) {