diff options
Diffstat (limited to 'debian/patches-rt/0299-sched-Remove-dead-__migrate_disabled-check.patch')
| -rw-r--r-- | debian/patches-rt/0299-sched-Remove-dead-__migrate_disabled-check.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/debian/patches-rt/0299-sched-Remove-dead-__migrate_disabled-check.patch b/debian/patches-rt/0299-sched-Remove-dead-__migrate_disabled-check.patch new file mode 100644 index 000000000..11109f24e --- /dev/null +++ b/debian/patches-rt/0299-sched-Remove-dead-__migrate_disabled-check.patch @@ -0,0 +1,35 @@ +From: Scott Wood <swood@redhat.com> +Date: Sat, 27 Jul 2019 00:56:33 -0500 +Subject: [PATCH 299/342] sched: Remove dead __migrate_disabled() check +Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=4abc9fbc0662890ad6eecb6b9daaf7d0544c7d22 + +[ Upstream commit 14d9272d534ea91262e15db99443fc5995c7c016 ] + +This code was unreachable given the __migrate_disabled() branch +to "out" immediately beforehand. + +Signed-off-by: Scott Wood <swood@redhat.com> +Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> +--- + kernel/sched/core.c | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/kernel/sched/core.c b/kernel/sched/core.c +index 4f5242c9ca78..e64d2b2b3a69 100644 +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -1182,13 +1182,6 @@ static int __set_cpus_allowed_ptr(struct task_struct *p, + if (cpumask_test_cpu(task_cpu(p), new_mask) || __migrate_disabled(p)) + goto out; + +-#if defined(CONFIG_SMP) && defined(CONFIG_PREEMPT_RT_BASE) +- if (__migrate_disabled(p)) { +- p->migrate_disable_update = 1; +- goto out; +- } +-#endif +- + if (task_running(rq, p) || p->state == TASK_WAKING) { + struct migration_arg arg = { p, dest_cpu }; + /* Need help from migration thread: drop lock and wait. */ |