Messages in this thread Patch in this message | | | Date | Fri, 17 Jan 2020 12:41:26 -0500 | From | Steven Rostedt <> | Subject | [PATCH RT 15/32] sched: Remove dead __migrate_disabled() check |
| |
4.19.94-rt39-rc1 stable review patch. If anyone has any objections, please let me know.
------------------
From: Scott Wood <swood@redhat.com>
[ 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 d6bd8129a390..a29f33e776d0 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. */ -- 2.24.1
| |