MIPS: mm: Remove redundant drop_mmu_context() cpu argument

paulburton · paulburton · commit 9a27324fde5d · 2019-02-04T10:56:12.000-08:00
The drop_mmu_context() function accepts a cpu argument, but it
implicitly expects that this is always equal to smp_processor_id() by
allocating &amp; configuring an ASID on the local CPU when the mm is active
on the CPU indicated by the cpu argument.

All callers do provide the value of smp_processor_id() to the cpu
argument.

Remove the redundant argument and have drop_mmu_context() call
smp_processor_id() itself, making it clearer that the cpu variable
always represents the local CPU.

Signed-off-by: Paul Burton &lt;paul.burton@mips.com&gt;
Cc: linux-mips@vger.kernel.org
diff --git a/arch/mips/include/asm/mmu_context.h b/arch/mips/include/asm/mmu_context.h
@@ -174,13 +174,15 @@ static inline void destroy_context(struct mm_struct *mm)
  * we will get a new one for it.
  */
 static inline void
-drop_mmu_context(struct mm_struct *mm, unsigned cpu)
+drop_mmu_context(struct mm_struct *mm)
 {
 	unsigned long flags;
+	unsigned int cpu;
 
 	local_irq_save(flags);
 	htw_stop();
 
+	cpu = smp_processor_id();
 	if (cpumask_test_cpu(cpu, mm_cpumask(mm)))  {
 		get_new_mmu_context(mm, cpu);
 		write_c0_entryhi(cpu_asid(cpu, mm));
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
@@ -700,7 +700,7 @@ static inline void local_r4k_flush_cache_page(void *args)
 			int cpu = smp_processor_id();
 
 			if (cpu_context(cpu, mm) != 0)
-				drop_mmu_context(mm, cpu);
+				drop_mmu_context(mm);
 		} else
 			vaddr ? r4k_blast_icache_page(addr) :
 				r4k_blast_icache_user_page(addr);
diff --git a/arch/mips/mm/tlb-r3k.c b/arch/mips/mm/tlb-r3k.c
@@ -75,7 +75,7 @@ void local_flush_tlb_mm(struct mm_struct *mm)
 #ifdef DEBUG_TLB
 		printk("[tlbmm<%lu>]", (unsigned long)cpu_context(cpu, mm));
 #endif
-		drop_mmu_context(mm, cpu);
+		drop_mmu_context(mm);
 	}
 }
 
@@ -117,7 +117,7 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
 			}
 			write_c0_entryhi(oldpid);
 		} else {
-			drop_mmu_context(mm, cpu);
+			drop_mmu_context(mm);
 		}
 		local_irq_restore(flags);
 	}
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c
@@ -115,7 +115,7 @@ void local_flush_tlb_mm(struct mm_struct *mm)
 	cpu = smp_processor_id();
 
 	if (cpu_context(cpu, mm) != 0) {
-		drop_mmu_context(mm, cpu);
+		drop_mmu_context(mm);
 	}
 
 	preempt_enable();
@@ -163,7 +163,7 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
 			write_c0_entryhi(oldpid);
 			htw_start();
 		} else {
-			drop_mmu_context(mm, cpu);
+			drop_mmu_context(mm);
 		}
 		flush_micro_tlb();
 		local_irq_restore(flags);
diff --git a/arch/mips/mm/tlb-r8k.c b/arch/mips/mm/tlb-r8k.c
@@ -55,7 +55,7 @@ void local_flush_tlb_mm(struct mm_struct *mm)
 	int cpu = smp_processor_id();
 
 	if (cpu_context(cpu, mm) != 0)
-		drop_mmu_context(mm, cpu);
+		drop_mmu_context(mm);
 }
 
 void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
@@ -75,7 +75,7 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
 	local_irq_save(flags);
 
 	if (size > TFP_TLB_SIZE / 2) {
-		drop_mmu_context(mm, cpu);
+		drop_mmu_context(mm);
 		goto out_restore;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ void local_flush_tlb_mm(struct mm_struct *mm)`
`75`	`75`	`#ifdef DEBUG_TLB`
`76`	`76`	`printk("[tlbmm<%lu>]", (unsigned long)cpu_context(cpu, mm));`
`77`	`77`	`#endif`
`78`		`- drop_mmu_context(mm, cpu);`
	`78`	`+ drop_mmu_context(mm);`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
`@@ -117,7 +117,7 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,`
`117`	`117`	`}`
`118`	`118`	`write_c0_entryhi(oldpid);`
`119`	`119`	`} else {`
`120`		`- drop_mmu_context(mm, cpu);`
	`120`	`+ drop_mmu_context(mm);`
`121`	`121`	`}`
`122`	`122`	`local_irq_restore(flags);`
`123`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ void local_flush_tlb_mm(struct mm_struct *mm)`
`55`	`55`	`int cpu = smp_processor_id();`
`56`	`56`
`57`	`57`	`if (cpu_context(cpu, mm) != 0)`
`58`		`- drop_mmu_context(mm, cpu);`
	`58`	`+ drop_mmu_context(mm);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,`
`@@ -75,7 +75,7 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,`
`75`	`75`	`local_irq_save(flags);`
`76`	`76`
`77`	`77`	`if (size > TFP_TLB_SIZE / 2) {`
`78`		`- drop_mmu_context(mm, cpu);`
	`78`	`+ drop_mmu_context(mm);`
`79`	`79`	`goto out_restore;`
`80`	`80`	`}`
`81`	`81`