cpumask: use mm_cpumask() wrapper: cris
authorRusty Russell <rusty@rustcorp.com.au>
Mon, 16 Mar 2009 03:41:47 +0000 (14:11 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Mon, 16 Mar 2009 03:41:47 +0000 (14:11 +1030)
Makes code futureproof against the impending change to mm->cpu_vm_mask.

It's also a chance to use the new cpumask_ ops which take a pointer
(the older ones are deprecated, but there's no hurry for arch code).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
arch/cris/arch-v32/kernel/smp.c
arch/cris/arch-v32/mm/tlb.c

index b47764c3308f55a4757881955a08dd5ac08ecd23..dc31b04d0827b19c4f0ef4456880a29db6c0755c 100644 (file)
@@ -232,7 +232,7 @@ void flush_tlb_common(struct mm_struct* mm, struct vm_area_struct* vma, unsigned
        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;
@@ -252,8 +252,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,
index 55ade36fe8a8b187cca9edfa4939da2ae6dab7ee..6779bcb28ab090cdeab6876461178b614da3a11a 100644 (file)
@@ -185,7 +185,7 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next,
                /* Make sure there is a MMU context. */
                spin_lock(&mmu_context_lock);
                get_mmu_context(next);
-               cpu_set(cpu, next->cpu_vm_mask);
+               cpumask_set_cpu(cpu, mm_cpumask(next));
                spin_unlock(&mmu_context_lock);
 
                /*