43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
From 21e0b28571016d773437dd56a61ed62bc81eb4c6 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <21e0b28571016d773437dd56a61ed62bc81eb4c6.1601675153.git.zanussi@kernel.org>
|
|
In-Reply-To: <5b5a156f9808b1acf1205606e03da117214549ea.1601675151.git.zanussi@kernel.org>
|
|
References: <5b5a156f9808b1acf1205606e03da117214549ea.1601675151.git.zanussi@kernel.org>
|
|
From: Scott Wood <swood@redhat.com>
|
|
Date: Sat, 27 Jul 2019 00:56:33 -0500
|
|
Subject: [PATCH 300/333] sched: Remove dead __migrate_disabled() check
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.148-rt64.tar.xz
|
|
|
|
[ 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 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
|
|
|