summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMel Gorman <mgorman@suse.de>2014-09-09 00:06:54 +0200
committerTejun Heo <tj@kernel.org>2014-09-09 00:17:43 +0200
commit59f6e2073c72d36c814a4417320bfa4874faa228 (patch)
tree3a9f6fcbdfcac06c004320e866f4bbf88a0b195c
parentia64: sn_nodepda cannot be assigned to after this_cpu conversion. Use __this_... (diff)
downloadlinux-59f6e2073c72d36c814a4417320bfa4874faa228.tar.xz
linux-59f6e2073c72d36c814a4417320bfa4874faa228.zip
percpu: Resolve ambiguities in __get_cpu_var/cpumask_var_t -fix
A commit in linux-next was causing boot to fail and bisection identified the patch 4ba2968420fa ("percpu: Resolve ambiguities in __get_cpu_var/cpumask_var_"). One of the changes in that patch looks very suspicious. Reverting the full patch fixes boot as does this fixlet. Signed-off-by: Mel Gorman <mgorman@suse.de> Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Christoph Lameter <cl@linux.com>
-rw-r--r--arch/x86/kernel/apic/x2apic_cluster.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
index 1f5d5f2ffae6..e658f21681c8 100644
--- a/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/arch/x86/kernel/apic/x2apic_cluster.c
@@ -43,6 +43,7 @@ __x2apic_send_IPI_mask(const struct cpumask *mask, int vector, int apic_dest)
* and be sure it's manipulated with irq off.
*/
ipi_mask_ptr = this_cpu_cpumask_var_ptr(ipi_mask);
+ cpumask_copy(ipi_mask_ptr, mask);
/*
* The idea is to send one IPI per cluster.