diff options
| author | Bo Yan <byan@nvidia.com> | 2013-04-24 17:39:02 -0700 |
|---|---|---|
| committer | Mrutyunjay Sawant <msawant@nvidia.com> | 2013-04-30 01:49:38 -0700 |
| commit | 1167dbec2b11245eaa10977f961fe18ef7104fac (patch) | |
| tree | 98d5bf5117b319cff7419ddb945a37e2714bc21f /kernel/smp.c | |
| parent | 70d75614b56e6d69f19b7da474aef9e8144024fe (diff) | |
Revert "smp: Fix SMP function call empty cpu mask race"
This reverts commit 846c314fd6124b5bd3a3db2624818f29616874a1.
Change-Id: Id0e9d586dfba4eb5743a6b07975d8d6667a478a6
Signed-off-by: Bo Yan <byan@nvidia.com>
Reviewed-on: http://git-master/r/222732
GVS: Gerrit_Virtual_Submit
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Diffstat (limited to 'kernel/smp.c')
| -rw-r--r-- | kernel/smp.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/kernel/smp.c b/kernel/smp.c index d5f3238ec458..2f8b10ecf759 100644 --- a/kernel/smp.c +++ b/kernel/smp.c @@ -31,7 +31,6 @@ struct call_function_data { struct call_single_data csd; atomic_t refs; cpumask_var_t cpumask; - cpumask_var_t cpumask_ipi; }; static DEFINE_PER_CPU_SHARED_ALIGNED(struct call_function_data, cfd_data); @@ -55,9 +54,6 @@ hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu) if (!zalloc_cpumask_var_node(&cfd->cpumask, GFP_KERNEL, cpu_to_node(cpu))) return notifier_from_errno(-ENOMEM); - if (!zalloc_cpumask_var_node(&cfd->cpumask_ipi, GFP_KERNEL, - cpu_to_node(cpu))) - return notifier_from_errno(-ENOMEM); break; #ifdef CONFIG_HOTPLUG_CPU @@ -67,7 +63,6 @@ hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu) case CPU_DEAD: case CPU_DEAD_FROZEN: free_cpumask_var(cfd->cpumask); - free_cpumask_var(cfd->cpumask_ipi); break; #endif }; @@ -529,12 +524,6 @@ void smp_call_function_many(const struct cpumask *mask, return; } - /* - * After we put an entry into the list, data->cpumask - * may be cleared again when another CPU sends another IPI for - * a SMP function call, so data->cpumask will be zero. - */ - cpumask_copy(data->cpumask_ipi, data->cpumask); raw_spin_lock_irqsave(&call_function.lock, flags); /* * Place entry at the _HEAD_ of the list, so that any cpu still @@ -558,7 +547,7 @@ void smp_call_function_many(const struct cpumask *mask, smp_mb(); /* Send a message to all CPUs in the map */ - arch_send_call_function_ipi_mask(data->cpumask_ipi); + arch_send_call_function_ipi_mask(data->cpumask); /* Optionally wait for the CPUs to complete */ if (wait) |