Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 3 insertions, 0 deletions

diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c
index b49d4ddaab93..0166a9847095 100644
--- a/arch/ia64/kernel/smp.c
+++ b/arch/ia64/kernel/smp.c
@@ -231,13 +231,16 @@ smp_flush_tlb_all (void)
 void
 smp_flush_tlb_mm (struct mm_struct *mm)
 {
+        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))
         {
                 local_finish_flush_tlb_mm(mm);
+                preempt_enable();
                 return;
         }
 
+        preempt_enable();
         /*
          * We could optimize this further by using mm->cpu_vm_mask to track which CPUs
          * have been running in the address space.  It's not clear that this is worth the