Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / ia64 / kernel / smp.c

diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c
index dabeefe211347f4d0e3c55d046c411f4060fb488..be450a3e9871673e22d56445dbe69f80522baac4 100644 (file)
--- a/arch/ia64/kernel/smp.c
+++ b/arch/ia64/kernel/smp.c
@@ -293,6 +293,7 @@ smp_flush_tlb_all (void)
 void
 smp_flush_tlb_mm (struct mm_struct *mm)
 {
+       cpumask_var_t cpus;
        preempt_disable();
        /* this happens for the common case of a single-threaded fork():  */
        if (likely(mm == current->active_mm && atomic_read(&mm->mm_users) == 1))
@@ -301,9 +302,15 @@ smp_flush_tlb_mm (struct mm_struct *mm)
                preempt_enable();
                return;
        }
-
-       smp_call_function_many(mm_cpumask(mm),
-               (void (*)(void *))local_finish_flush_tlb_mm, mm, 1);
+       if (!alloc_cpumask_var(&cpus, GFP_ATOMIC)) {
+               smp_call_function((void (*)(void *))local_finish_flush_tlb_mm,
+                       mm, 1);
+       } else {
+               cpumask_copy(cpus, mm_cpumask(mm));
+               smp_call_function_many(cpus,
+                       (void (*)(void *))local_finish_flush_tlb_mm, mm, 1);
+               free_cpumask_var(cpus);
+       }
        local_irq_disable();
        local_finish_flush_tlb_mm(mm);
        local_irq_enable();