cpumask: use mm_cpumask() wrapper: m32r
PATCH 8/13 cpumask: use mm_cpumask() wrapper: m32r
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).
--- arch/m32r/include/asm/mmu_context.h | 4 ++-- arch/m32r/kernel/smp.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
arch/m32r/kernel/smp.c +4 -4
@@ -264,7 +264,7 @@ void smp_flush_tlb_mm(struct mm_struct *preempt_disable (); cpu_id =smp_processor_id (); mmc = &mm->context[cpu_id]; - cpu_mask = mm->cpu_vm_mask; + cpu_mask = *mm_cpumask (mm);cpu_clear (cpu_id, cpu_mask);if (*mmc !=NO_CONTEXT ) {
@@ -273,7 +273,7 @@ void smp_flush_tlb_mm(struct mm_struct *if (mm == current->mm)activate_context (mm);else -cpu_clear (cpu_id, mm->cpu_vm_mask); +cpumask_clear_cpu (cpu_id,mm_cpumask (mm));local_irq_restore (flags); }if (!cpus_empty (cpu_mask))
@@ -334,7 +334,7 @@ void smp_flush_tlb_page(struct vm_area_spreempt_disable (); cpu_id =smp_processor_id (); mmc = &mm->context[cpu_id]; - cpu_mask = mm->cpu_vm_mask; + cpu_mask = *mm_cpumask (mm);cpu_clear (cpu_id, cpu_mask);#ifdef DEBUG_SMP
@@ -469,7 +469,7 @@ void smp_invalidate_interrupt(void)if (flush_mm == current->active_mm)activate_context (flush_mm);else -cpu_clear (cpu_id, flush_mm->cpu_vm_mask); +cpumask_clear (cpu_id,mm_cpumask (flush_mm)); }else {unsigned long va = flush_va;
arch/m32r/include/asm/mmu_context.h +2 -2
@@ -127,7 +127,7 @@ static inline void switch_mm(struct mm_sif (prev != next) {#ifdef CONFIG_SMP -cpu_set (cpu, next->cpu_vm_mask); +cpumask_set_cpu (cpu,mm_cpumask (next));#endif /* CONFIG_SMP */ /* Set MPTB = next->pgd */ *(volatile unsigned long *)MPTB = (unsigned long )next->pgd;
@@ -135,7 +135,7 @@ static inline void switch_mm(struct mm_s }#ifdef CONFIG_SMP else - if (!cpu_test_and_set(cpu, next->cpu_vm_mask)) + if (!cpumask_test_and_set_cpu(cpu, mm_cpumask(next)) activate_context(next);#endif /* CONFIG_SMP */ }
Hello,
I apologize for my too late reply.
I've checked the patch and fixed two typos.
Thank you.
--- arch/m32r/include/asm/mmu_context.h | 2 +- arch/m32r/kernel/smp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/m32r/include/asm/mmu_context.h +1 -1
@@ -135,7 +135,7 @@ static inline void switch_mm(struct mm_struct *prev, }#ifdef CONFIG_SMP else - if (!cpumask_test_and_set_cpu(cpu, mm_cpumask(next)) + if (!cpumask_test_and_set_cpu(cpu, mm_cpumask(next))) activate_context(next);#endif /* CONFIG_SMP */ }
arch/m32r/kernel/smp.c +1 -1
@@ -469,7 +469,7 @@ void smp_invalidate_interrupt(void)if (flush_mm == current->active_mm)activate_context (flush_mm);else -cpumask_clear (cpu_id,mm_cpumask (flush_mm)); +cpumask_clear_cpu (cpu_id,mm_cpumask (flush_mm)); }else {unsigned long va = flush_va;
Signature · 4 lines
1.6.4.4 At Fri, 12 Jun 2009 22:33:14 +0930,
Quoted 74 lines · Rusty Russell
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 <[email protected]>--- arch/m32r/include/asm/mmu_context.h | 4 ++-- arch/m32r/kernel/smp.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)arch/m32r/kernel/smp.c +4
-4@@ -264,7 +264,7 @@ void smp_flush_tlb_mm(struct mm_struct *preempt_disable (); cpu_id =smp_processor_id (); mmc = &mm->context[cpu_id]; - cpu_mask = mm->cpu_vm_mask; + cpu_mask = *mm_cpumask (mm);cpu_clear (cpu_id, cpu_mask);if (*mmc !=NO_CONTEXT ) {@@ -273,7 +273,7 @@ void smp_flush_tlb_mm(struct mm_struct *if (mm == current->mm)activate_context (mm);else -cpu_clear (cpu_id, mm->cpu_vm_mask); +cpumask_clear_cpu (cpu_id,mm_cpumask (mm));local_irq_restore (flags); }if (!cpus_empty (cpu_mask))@@ -334,7 +334,7 @@ void smp_flush_tlb_page(struct vm_area_spreempt_disable (); cpu_id =smp_processor_id (); mmc = &mm->context[cpu_id]; - cpu_mask = mm->cpu_vm_mask; + cpu_mask = *mm_cpumask (mm);cpu_clear (cpu_id, cpu_mask);#ifdef DEBUG_SMP @@ -469,7 +469,7 @@ void smp_invalidate_interrupt(void)if (flush_mm == current->active_mm)activate_context (flush_mm);else -cpu_clear (cpu_id, flush_mm->cpu_vm_mask); +cpumask_clear (cpu_id,mm_cpumask (flush_mm)); }else {unsigned long va = flush_va;arch/m32r/include/asm/mmu_context.h +2
-2@@ -127,7 +127,7 @@ static inline void switch_mm(struct mm_sif (prev != next) {#ifdef CONFIG_SMP -cpu_set (cpu, next->cpu_vm_mask); +cpumask_set_cpu (cpu,mm_cpumask (next));#endif /* CONFIG_SMP */ /* Set MPTB = next->pgd */ *(volatile unsigned long *)MPTB = (unsigned long )next->pgd;@@ -135,7 +135,7 @@ static inline void switch_mm(struct mm_s }#ifdef CONFIG_SMP else - if (!cpu_test_and_set(cpu, next->cpu_vm_mask)) + if (!cpumask_test_and_set_cpu(cpu, mm_cpumask(next)) activate_context(next);#endif /* CONFIG_SMP */ }
Quoted 5 lines · Hirokazu Takata
Hello,
I apologize for my too late reply.
I've checked the patch and fixed two typos.
Thanks! This has been in linux-next for about two cycles, and I am about to finally push to Linus.
Cheers,
Rusty.