MIPS: mm: Remove local_flush_tlb_mm()

paulburton · paulburton · commit 558ec8ad71c9 · 2019-02-04T10:56:24.000-08:00
All 3 variants of local_flush_tlb_mm() are now effectively simple calls
to drop_mmu_context(). Remove them and use drop_mmu_context() directly.

Signed-off-by: Paul Burton &lt;paul.burton@mips.com&gt;
Cc: linux-mips@vger.kernel.org
diff --git a/arch/mips/include/asm/tlbflush.h b/arch/mips/include/asm/tlbflush.h
@@ -14,7 +14,6 @@
  *  - flush_tlb_kernel_range(start, end) flushes a range of kernel pages
  */
 extern void local_flush_tlb_all(void);
-extern void local_flush_tlb_mm(struct mm_struct *mm);
 extern void local_flush_tlb_range(struct vm_area_struct *vma,
 	unsigned long start, unsigned long end);
 extern void local_flush_tlb_kernel_range(unsigned long start,
@@ -23,6 +22,8 @@ extern void local_flush_tlb_page(struct vm_area_struct *vma,
 	unsigned long page);
 extern void local_flush_tlb_one(unsigned long vaddr);
 
+#include <asm/mmu_context.h>
+
 #ifdef CONFIG_SMP
 
 extern void flush_tlb_all(void);
@@ -36,7 +37,7 @@ extern void flush_tlb_one(unsigned long vaddr);
 #else /* CONFIG_SMP */
 
 #define flush_tlb_all()			local_flush_tlb_all()
-#define flush_tlb_mm(mm)		local_flush_tlb_mm(mm)
+#define flush_tlb_mm(mm)		drop_mmu_context(mm)
 #define flush_tlb_range(vma, vmaddr, end)	local_flush_tlb_range(vma, vmaddr, end)
 #define flush_tlb_kernel_range(vmaddr,end) \
 	local_flush_tlb_kernel_range(vmaddr, end)
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
@@ -487,7 +487,7 @@ void flush_tlb_all(void)
 
 static void flush_tlb_mm_ipi(void *mm)
 {
-	local_flush_tlb_mm((struct mm_struct *)mm);
+	drop_mmu_context((struct mm_struct *)mm);
 }
 
 /*
@@ -540,7 +540,7 @@ void flush_tlb_mm(struct mm_struct *mm)
 				cpu_context(cpu, mm) = 0;
 		}
 	}
-	local_flush_tlb_mm(mm);
+	drop_mmu_context(mm);
 
 	preempt_enable();
 }
diff --git a/arch/mips/mm/tlb-r3k.c b/arch/mips/mm/tlb-r3k.c
@@ -67,18 +67,6 @@ void local_flush_tlb_all(void)
 	local_irq_restore(flags);
 }
 
-void local_flush_tlb_mm(struct mm_struct *mm)
-{
-#ifdef DEBUG_TLB
-	int cpu = smp_processor_id();
-
-	if (cpu_context(cpu, mm) != 0)
-		printk("[tlbmm<%lu>]", (unsigned long)cpu_context(cpu, mm));
-#endif
-
-	drop_mmu_context(mm);
-}
-
 void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
 			   unsigned long end)
 {
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c
@@ -104,13 +104,6 @@ void local_flush_tlb_all(void)
 }
 EXPORT_SYMBOL(local_flush_tlb_all);
 
-/* All entries common to a mm share an asid.  To effectively flush
-   these entries, we just bump the asid. */
-void local_flush_tlb_mm(struct mm_struct *mm)
-{
-	drop_mmu_context(mm);
-}
-
 void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
 	unsigned long end)
 {
diff --git a/arch/mips/mm/tlb-r8k.c b/arch/mips/mm/tlb-r8k.c
@@ -50,11 +50,6 @@ void local_flush_tlb_all(void)
 	local_irq_restore(flags);
 }
 
-void local_flush_tlb_mm(struct mm_struct *mm)
-{
-	drop_mmu_context(mm);
-}
-
 void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
 	unsigned long end)
 {

Original file line number	Diff line number	Diff line change
`@@ -487,7 +487,7 @@ void flush_tlb_all(void)`
`487`	`487`
`488`	`488`	`static void flush_tlb_mm_ipi(void *mm)`
`489`	`489`	`{`
`490`		`- local_flush_tlb_mm((struct mm_struct *)mm);`
	`490`	`+ drop_mmu_context((struct mm_struct *)mm);`
`491`	`491`	`}`
`492`	`492`
`493`	`493`	`/*`
`@@ -540,7 +540,7 @@ void flush_tlb_mm(struct mm_struct *mm)`
`540`	`540`	`cpu_context(cpu, mm) = 0;`
`541`	`541`	`}`
`542`	`542`	`}`
`543`		`- local_flush_tlb_mm(mm);`
	`543`	`+ drop_mmu_context(mm);`
`544`	`544`
`545`	`545`	`preempt_enable();`
`546`	`546`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,13 +104,6 @@ void local_flush_tlb_all(void)`
`104`	`104`	`}`
`105`	`105`	`EXPORT_SYMBOL(local_flush_tlb_all);`
`106`	`106`
`107`		`-/* All entries common to a mm share an asid. To effectively flush`
`108`		`- these entries, we just bump the asid. */`
`109`		`-void local_flush_tlb_mm(struct mm_struct *mm)`
`110`		`-{`
`111`		`- drop_mmu_context(mm);`
`112`		`-}`
`113`		`-`
`114`	`107`	`void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,`
`115`	`108`	`unsigned long end)`
`116`	`109`	`{`
Original file line number	Diff line number	Diff line change
`@@ -50,11 +50,6 @@ void local_flush_tlb_all(void)`
`50`	`50`	`local_irq_restore(flags);`
`51`	`51`	`}`
`52`	`52`
`53`		`-void local_flush_tlb_mm(struct mm_struct *mm)`
`54`		`-{`
`55`		`- drop_mmu_context(mm);`
`56`		`-}`
`57`		`-`
`58`	`53`	`void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,`
`59`	`54`	`unsigned long end)`
`60`	`55`	`{`