| From | zanussi@kernel ... | Subject | [PATCH RT 08/25] sched: Remove dead __migrate_disabled() check | Date | Fri, 21 Feb 2020 15:24:36 -0600 |
| |
From: Scott Wood <swood@redhat.com>
v4.14.170-rt75-rc1 stable review patch. If anyone has any objections, please let me know.
-----------
[ 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: Tom Zanussi <zanussi@kernel.org>
Conflicts: kernel/sched/core.c --- kernel/sched/core.c | 7 ------- 1 file changed, 7 deletions(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 8d6badac9225..4708129e8df1 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1217,13 +1217,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. */ -- 2.14.1
|