Merge branch 'master' of ssh://master.kernel.org/home/ftp/pub/scm/linux/kernel/git...

Conflicts:
	arch/sparc/kernel/smp_64.c

diff --cc arch/sparc/kernel/irq_64.c
Simple merge

diff --cc arch/sparc/kernel/smp_64.c
index 79457f6,2de937c..708e12a
--- 1/arch/sparc/kernel/smp_64.c
--- 2/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@@ -1074,8 -1074,8 +1074,8 @@@ void smp_flush_tlb_pending(struct mm_st
        u32 ctx = CTX_HWBITS(mm->context);
        int cpu = get_cpu();
  
 -      if (mm == current->active_mm && atomic_read(&mm->mm_users) == 1)
 +      if (mm == current->mm && atomic_read(&mm->mm_users) == 1)
-               mm->cpu_vm_mask = cpumask_of_cpu(cpu);
+               cpumask_copy(mm_cpumask(mm), cpumask_of(cpu));
        else
                smp_cross_call_masked(&xcall_flush_tlb_pending,
                                      ctx, nr, (unsigned long) vaddrs,