linux-next: manual merge of the rr-latest-cpumask tree with the armtree

[Stephen Rothwell]

Hi Rusty,

Today's linux-next merge of the rr-latest-cpumask tree got a conflict in
arch/arm/kernel/smp.c between commit
faa7bc51c11d5bbe440ac04710fd7a3208782000 ("Check whether the TLB
operations need broadcasting on SMP systems") from the arm tree and
commit a29a30f4777dc23679cd588912e0a93f5ab777b0
("cpumask:use-mm_cpumask-arm") from the rr-latest-cpumask tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/kernel/smp.c
index de885fd,9a36ed2..0000000
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@@ -642,21 -592,17 +642,21 @@@ void flush_tlb_all(void
  
  void flush_tlb_mm(struct mm_struct *mm)
  {
 -	on_each_cpu_mask(ipi_flush_tlb_mm, mm, 1, mm_cpumask(mm));
 +	if (tlb_ops_need_broadcast())
- 		on_each_cpu_mask(ipi_flush_tlb_mm, mm, 1, &mm->cpu_vm_mask);
++		on_each_cpu_mask(ipi_flush_tlb_mm, mm, 1, mm_cpumask(mm));
 +	else
 +		local_flush_tlb_mm(mm);
  }
  
  void flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr)
  {
 -	struct tlb_args ta;
 -
 -	ta.ta_vma = vma;
 -	ta.ta_start = uaddr;
 -
 -	on_each_cpu_mask(ipi_flush_tlb_page, &ta, 1, mm_cpumask(vma->vm_mm));
 +	if (tlb_ops_need_broadcast()) {
 +		struct tlb_args ta;
 +		ta.ta_vma = vma;
 +		ta.ta_start = uaddr;
- 		on_each_cpu_mask(ipi_flush_tlb_page, &ta, 1, &vma->vm_mm->cpu_vm_mask);
++		on_each_cpu_mask(ipi_flush_tlb_page, &ta, 1, mm_cpumask(vma->vm_mm));
 +	} else
 +		local_flush_tlb_page(vma, uaddr);
  }
  
  void flush_tlb_kernel_page(unsigned long kaddr)
@@@ -672,14 -617,13 +672,14 @@@
  void flush_tlb_range(struct vm_area_struct *vma,
                       unsigned long start, unsigned long end)
  {
 -	struct tlb_args ta;
 -
 -	ta.ta_vma = vma;
 -	ta.ta_start = start;
 -	ta.ta_end = end;
 -
 -	on_each_cpu_mask(ipi_flush_tlb_range, &ta, 1, mm_cpumask(vma->vm_mm));
 +	if (tlb_ops_need_broadcast()) {
 +		struct tlb_args ta;
 +		ta.ta_vma = vma;
 +		ta.ta_start = start;
 +		ta.ta_end = end;
- 		on_each_cpu_mask(ipi_flush_tlb_range, &ta, 1, &vma->vm_mm->cpu_vm_mask);
++		on_each_cpu_mask(ipi_flush_tlb_range, &ta, 1, mm_cpumask(vma->vm_mm));
 +	} else
 +		local_flush_tlb_range(vma, start, end);
  }
  
  void flush_tlb_kernel_range(unsigned long start, unsigned long end)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/