Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux...

diff --combined arch/cris/arch-v32/kernel/smp.c
index f59a973c97ee31893595b2a6c6e2e7778ce15e10,dc31b04d0827b19c4f0ef4456880a29db6c0755c..d2a3ff8c4d37e59a1eaec5dda7f5edb41aff67aa
--- 1/arch/cris/arch-v32/kernel/smp.c
--- 2/arch/cris/arch-v32/kernel/smp.c
+++ b/arch/cris/arch-v32/kernel/smp.c
@@@ -65,6 -65,7 +65,6 @@@ static int send_ipi(int vector, int wai
  static struct irqaction irq_ipi  = {
        .handler = crisv32_ipi_interrupt,
        .flags = IRQF_DISABLED,
 -      .mask = CPU_MASK_NONE,
        .name = "ipi",
  };
  
@@@ -97,9 -98,9 +97,9 @@@ void __devinit smp_prepare_boot_cpu(voi
        SUPP_BANK_SEL(2);
        SUPP_REG_WR(RW_MM_TLB_PGD, pgd);
  
-       cpu_set(0, cpu_online_map);
+       set_cpu_online(0, true);
        cpu_set(0, phys_cpu_present_map);
-       cpu_set(0, cpu_possible_map);
+       set_cpu_possible(0, true);
  }
  
  void __init smp_cpus_done(unsigned int max_cpus)
@@@ -231,7 -232,7 +231,7 @@@ void flush_tlb_common(struct mm_struct
        cpumask_t cpu_mask;
  
        spin_lock_irqsave(&tlbstate_lock, flags);
-       cpu_mask = (mm == FLUSH_ALL ? CPU_MASK_ALL : mm->cpu_vm_mask);
+       cpu_mask = (mm == FLUSH_ALL ? cpu_all_mask : *mm_cpumask(mm));
        cpu_clear(smp_processor_id(), cpu_mask);
        flush_mm = mm;
        flush_vma = vma;
@@@ -251,8 -252,8 +251,8 @@@ void flush_tlb_mm(struct mm_struct *mm
        __flush_tlb_mm(mm);
        flush_tlb_common(mm, FLUSH_ALL, 0);
        /* No more mappings in other CPUs */
-       cpus_clear(mm->cpu_vm_mask);
-       cpu_set(smp_processor_id(), mm->cpu_vm_mask);
+       cpumask_clear(mm_cpumask(mm));
+       cpumask_set_cpu(smp_processor_id(), mm_cpumask(mm));
  }
  
  void flush_tlb_page(struct vm_area_struct *vma,