percpu: Resolve ambiguities in __get_cpu_var/cpumask_var_t

[linux-2.6-block.git] / arch / x86 / kernel / apic / x2apic_cluster.c

diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
index 6ce600f9bc789e2ccf0fe53bd6cb61091ebd0340..1f5d5f2ffae630111bceab6aefd8f138b33e0c6e 100644 (file)
--- a/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/arch/x86/kernel/apic/x2apic_cluster.c
@@ -42,8 +42,7 @@ __x2apic_send_IPI_mask(const struct cpumask *mask, int vector, int apic_dest)
         * We are to modify mask, so we need an own copy
         * and be sure it's manipulated with irq off.
         */
-       ipi_mask_ptr = __raw_get_cpu_var(ipi_mask);
-       cpumask_copy(ipi_mask_ptr, mask);
+       ipi_mask_ptr = this_cpu_cpumask_var_ptr(ipi_mask);
 
        /*
         * The idea is to send one IPI per cluster.