1 files changed, 8 insertions, 6 deletions

diff --git a/arch/arc/mm/tlb.c b/arch/arc/mm/tlb.c
index 5f53050abf60..db0f0f823980 100644
--- a/arch/arc/mm/tlb.c
+++ b/arch/arc/mm/tlb.c
@@ -100,7 +100,7 @@
 
 
 /* A copy of the ASID from the PID reg is kept in asid_cache */
-unsigned int asid_cache = MM_CTXT_FIRST_CYCLE;
+DEFINE_PER_CPU(unsigned int, asid_cache) = MM_CTXT_FIRST_CYCLE;
 
 /*
  * Utility Routine to erase a J-TLB entry
@@ -274,6 +274,7 @@ noinline void local_flush_tlb_mm(struct mm_struct *mm)
 void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
                            unsigned long end)
 {
+        const unsigned int cpu = smp_processor_id();
         unsigned long flags;
 
         /* If range @start to @end is more than 32 TLB entries deep,
@@ -297,9 +298,9 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
 
         local_irq_save(flags);
 
-        if (vma->vm_mm->context.asid != MM_CTXT_NO_ASID) {
+        if (asid_mm(vma->vm_mm, cpu) != MM_CTXT_NO_ASID) {
                 while (start < end) {
-                        tlb_entry_erase(start | hw_pid(vma->vm_mm));
+                        tlb_entry_erase(start | hw_pid(vma->vm_mm, cpu));
                         start += PAGE_SIZE;
                 }
         }
@@ -346,6 +347,7 @@ void local_flush_tlb_kernel_range(unsigned long start, unsigned long end)
 
 void local_flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
 {
+        const unsigned int cpu = smp_processor_id();
         unsigned long flags;
 
         /* Note that it is critical that interrupts are DISABLED between
@@ -353,8 +355,8 @@ void local_flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
          */
         local_irq_save(flags);
 
-        if (vma->vm_mm->context.asid != MM_CTXT_NO_ASID) {
-                tlb_entry_erase((page & PAGE_MASK) | hw_pid(vma->vm_mm));
+        if (asid_mm(vma->vm_mm, cpu) != MM_CTXT_NO_ASID) {
+                tlb_entry_erase((page & PAGE_MASK) | hw_pid(vma->vm_mm, cpu));
                 utlb_invalidate();
         }
 
@@ -400,7 +402,7 @@ void create_tlb(struct vm_area_struct *vma, unsigned long address, pte_t *ptep)
 
         local_irq_save(flags);
 
-        tlb_paranoid_check(vma->vm_mm->context.asid, address);
+        tlb_paranoid_check(asid_mm(vma->vm_mm, smp_processor_id()), address);
 
         address &= PAGE_MASK;