From 80c7dc1ac20f64951c4b5590b65b0db2a5b20880 Mon Sep 17 00:00:00 2001 Message-Id: <80c7dc1ac20f64951c4b5590b65b0db2a5b20880.1596234184.git.zanussi@kernel.org> In-Reply-To: <378ee68279f6a7631221f2670a9298620148690d.1596234183.git.zanussi@kernel.org> References: <378ee68279f6a7631221f2670a9298620148690d.1596234183.git.zanussi@kernel.org> From: Scott Wood Date: Sat, 27 Jul 2019 00:56:33 -0500 Subject: [PATCH 300/329] sched: Remove dead __migrate_disabled() check Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.135-rt60.tar.xz [ Upstream commit 14d9272d534ea91262e15db99443fc5995c7c016 ] This code was unreachable given the __migrate_disabled() branch to "out" immediately beforehand. Signed-off-by: Scott Wood Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Steven Rostedt (VMware) --- kernel/sched/core.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 357bf627799f..7109b23c7a60 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.17.1