| From 3b9d65024d8f424f81c0b5e36bb38a03924106c9 Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sun, 17 Jul 2011 19:35:29 +0200 |
| Subject: [PATCH 142/274] hotplug-use-migrate-disable.patch |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| --- |
| kernel/cpu.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/kernel/cpu.c b/kernel/cpu.c |
| index 1e80dff..c8aee90 100644 |
| --- a/kernel/cpu.c |
| +++ b/kernel/cpu.c |
| @@ -329,14 +329,13 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen) |
| 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(); |
| |
| err = __cpu_notify(CPU_DOWN_PREPARE | mod, hcpu, -1, &nr_calls); |
| if (err) { |
| @@ -386,6 +385,7 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen) |
| out_release: |
| cpu_unplug_done(cpu); |
| out_cancel: |
| + migrate_enable(); |
| cpu_hotplug_done(); |
| if (!err) |
| cpu_notify_nofail(CPU_POST_DEAD | mod, hcpu); |
| -- |
| 1.7.10.4 |
| |
