Merge branch 'lsk/v3.10/topic/of' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / arch / mips / mm / tlb-r8k.c

diff --git a/arch/mips/mm/tlb-r8k.c b/arch/mips/mm/tlb-r8k.c
index 122f9207f49e7f58871cda1bb681f73370fd1286..91c2499f806a25809259a0b9682667ce2d7f31d5 100644 (file)
--- a/arch/mips/mm/tlb-r8k.c
+++ b/arch/mips/mm/tlb-r8k.c
@@ -195,7 +195,7 @@ void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte)
        if (current->active_mm != vma->vm_mm)
                return;
 
-       pid = ASID_MASK(read_c0_entryhi());
+       pid = read_c0_entryhi() & ASID_MASK;
 
        local_irq_save(flags);
        address &= PAGE_MASK;