Commit 9a27324f authored by Paul Burton's avatar Paul Burton

MIPS: mm: Remove redundant drop_mmu_context() cpu argument

The drop_mmu_context() function accepts a cpu argument, but it
implicitly expects that this is always equal to smp_processor_id() by
allocating & 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: default avatarPaul Burton <paul.burton@mips.com>
Cc: linux-mips@vger.kernel.org
parent c653bd04
...@@ -174,13 +174,15 @@ static inline void destroy_context(struct mm_struct *mm) ...@@ -174,13 +174,15 @@ static inline void destroy_context(struct mm_struct *mm)
* we will get a new one for it. * we will get a new one for it.
*/ */
static inline void static inline void
drop_mmu_context(struct mm_struct *mm, unsigned cpu) drop_mmu_context(struct mm_struct *mm)
{ {
unsigned long flags; unsigned long flags;
unsigned int cpu;
local_irq_save(flags); local_irq_save(flags);
htw_stop(); htw_stop();
cpu = smp_processor_id();
if (cpumask_test_cpu(cpu, mm_cpumask(mm))) { if (cpumask_test_cpu(cpu, mm_cpumask(mm))) {
get_new_mmu_context(mm, cpu); get_new_mmu_context(mm, cpu);
write_c0_entryhi(cpu_asid(cpu, mm)); write_c0_entryhi(cpu_asid(cpu, mm));
......
...@@ -700,7 +700,7 @@ static inline void local_r4k_flush_cache_page(void *args) ...@@ -700,7 +700,7 @@ static inline void local_r4k_flush_cache_page(void *args)
int cpu = smp_processor_id(); int cpu = smp_processor_id();
if (cpu_context(cpu, mm) != 0) if (cpu_context(cpu, mm) != 0)
drop_mmu_context(mm, cpu); drop_mmu_context(mm);
} else } else
vaddr ? r4k_blast_icache_page(addr) : vaddr ? r4k_blast_icache_page(addr) :
r4k_blast_icache_user_page(addr); r4k_blast_icache_user_page(addr);
......
...@@ -75,7 +75,7 @@ void local_flush_tlb_mm(struct mm_struct *mm) ...@@ -75,7 +75,7 @@ void local_flush_tlb_mm(struct mm_struct *mm)
#ifdef DEBUG_TLB #ifdef DEBUG_TLB
printk("[tlbmm<%lu>]", (unsigned long)cpu_context(cpu, mm)); printk("[tlbmm<%lu>]", (unsigned long)cpu_context(cpu, mm));
#endif #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, ...@@ -117,7 +117,7 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
} }
write_c0_entryhi(oldpid); write_c0_entryhi(oldpid);
} else { } else {
drop_mmu_context(mm, cpu); drop_mmu_context(mm);
} }
local_irq_restore(flags); local_irq_restore(flags);
} }
......
...@@ -115,7 +115,7 @@ void local_flush_tlb_mm(struct mm_struct *mm) ...@@ -115,7 +115,7 @@ void local_flush_tlb_mm(struct mm_struct *mm)
cpu = smp_processor_id(); cpu = smp_processor_id();
if (cpu_context(cpu, mm) != 0) { if (cpu_context(cpu, mm) != 0) {
drop_mmu_context(mm, cpu); drop_mmu_context(mm);
} }
preempt_enable(); preempt_enable();
...@@ -163,7 +163,7 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start, ...@@ -163,7 +163,7 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
write_c0_entryhi(oldpid); write_c0_entryhi(oldpid);
htw_start(); htw_start();
} else { } else {
drop_mmu_context(mm, cpu); drop_mmu_context(mm);
} }
flush_micro_tlb(); flush_micro_tlb();
local_irq_restore(flags); local_irq_restore(flags);
......
...@@ -55,7 +55,7 @@ void local_flush_tlb_mm(struct mm_struct *mm) ...@@ -55,7 +55,7 @@ void local_flush_tlb_mm(struct mm_struct *mm)
int cpu = smp_processor_id(); int cpu = smp_processor_id();
if (cpu_context(cpu, mm) != 0) 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, 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,7 +75,7 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
local_irq_save(flags); local_irq_save(flags);
if (size > TFP_TLB_SIZE / 2) { if (size > TFP_TLB_SIZE / 2) {
drop_mmu_context(mm, cpu); drop_mmu_context(mm);
goto out_restore; goto out_restore;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment