41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
Subject: hotplug: Use migrate disable on unplug
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Sun, 17 Jul 2011 19:35:29 +0200
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patches-4.4.1-rt6.tar.xz
|
|
|
|
Migration needs to be disabled accross the unplug handling to make
|
|
sure that the unplug thread is off the unplugged cpu.
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
kernel/cpu.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/kernel/cpu.c
|
|
+++ b/kernel/cpu.c
|
|
@@ -455,14 +455,13 @@ static int _cpu_down(unsigned int cpu, i
|
|
cpumask_andnot(cpumask, cpu_online_mask, cpumask_of(cpu));
|
|
set_cpus_allowed_ptr(current, cpumask);
|
|
free_cpumask_var(cpumask);
|
|
- preempt_disable();
|
|
+ migrate_disable();
|
|
mycpu = smp_processor_id();
|
|
if (mycpu == cpu) {
|
|
printk(KERN_ERR "Yuck! Still on unplug CPU\n!");
|
|
- preempt_enable();
|
|
+ migrate_enable();
|
|
return -EBUSY;
|
|
}
|
|
- preempt_enable();
|
|
|
|
cpu_hotplug_begin();
|
|
err = cpu_unplug_begin(cpu);
|
|
@@ -543,6 +542,7 @@ static int _cpu_down(unsigned int cpu, i
|
|
out_release:
|
|
cpu_unplug_done(cpu);
|
|
out_cancel:
|
|
+ migrate_enable();
|
|
cpu_hotplug_done();
|
|
if (!err)
|
|
cpu_notify_nofail(CPU_POST_DEAD | mod, hcpu);
|