summaryrefslogtreecommitdiffstats
path: root/kernel/stop_machine.c
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2015-10-09 18:36:29 +0200
committerIngo Molnar <mingo@kernel.org>2015-10-20 10:25:56 +0200
commit62694cd51322262a9142e946915fc4783113ccff (patch)
treeafcbbd408026ef603f6831fce8867b73601d77ec /kernel/stop_machine.c
parent07f06cb3b5f6bd21374a48dbefdb431d71d53974 (diff)
downloadlinux-stable-62694cd51322262a9142e946915fc4783113ccff.tar.gz
linux-stable-62694cd51322262a9142e946915fc4783113ccff.tar.bz2
linux-stable-62694cd51322262a9142e946915fc4783113ccff.zip
sched: Move cpu_active() tests from stop_two_cpus() into migrate_swap_stop()
The cpu_active() tests are not fundamentally part of stop_two_cpus(), move then into the scheduler where they belong. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/stop_machine.c')
-rw-r--r--kernel/stop_machine.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
index e5a09d2dc575..867bc20e1ef1 100644
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
@@ -275,15 +275,6 @@ int stop_two_cpus(unsigned int cpu1, unsigned int cpu2, cpu_stop_fn_t fn, void *
cpu_stop_init_done(&done, 2);
set_state(&msdata, MULTI_STOP_PREPARE);
- /*
- * We do not want to migrate to inactive CPU. FIXME: move this
- * into migrate_swap_stop() callback.
- */
- if (!cpu_active(cpu1) || !cpu_active(cpu2)) {
- preempt_enable();
- return -ENOENT;
- }
-
if (cpu1 > cpu2)
swap(cpu1, cpu2);
if (cpu_stop_queue_two_works(cpu1, &work1, cpu2, &work2)) {