Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[karo-tx-linux.git] / arch / ia64 / kernel / smp.c

diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c
index f0c521b0ba4c2335af80a8f660c2d00cc3fc50f6..dabeefe211347f4d0e3c55d046c411f4060fb488 100644 (file)
--- a/arch/ia64/kernel/smp.c
+++ b/arch/ia64/kernel/smp.c
@@ -58,7 +58,8 @@ static struct local_tlb_flush_counts {
        unsigned int count;
 } __attribute__((__aligned__(32))) local_tlb_flush_counts[NR_CPUS];
 
-static DEFINE_PER_CPU(unsigned short, shadow_flush_counts[NR_CPUS]) ____cacheline_aligned;
+static DEFINE_PER_CPU_SHARED_ALIGNED(unsigned short [NR_CPUS],
+                                    shadow_flush_counts);
 
 #define IPI_CALL_FUNC          0
 #define IPI_CPU_STOP           1
@@ -301,7 +302,7 @@ smp_flush_tlb_mm (struct mm_struct *mm)
                return;
        }
 
-       smp_call_function_mask(mm->cpu_vm_mask,
+       smp_call_function_many(mm_cpumask(mm),
                (void (*)(void *))local_finish_flush_tlb_mm, mm, 1);
        local_irq_disable();
        local_finish_flush_tlb_mm(mm);