Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[karo-tx-linux.git] / arch / mips / mm / tlbex.c

diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 4f642e07c2b198b3c9e46e3bc9f64bbe2bcb6606..ed1c5297547afb322344175bfab02b89a3fd0080 100644 (file)
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -865,6 +865,13 @@ void build_get_pmde64(u32 **p, struct uasm_label **l, struct uasm_reloc **r,
 
        uasm_i_andi(p, tmp, tmp, (PTRS_PER_PGD - 1)<<3);
        uasm_i_daddu(p, ptr, ptr, tmp); /* add in pgd offset */
+#ifndef __PAGETABLE_PUD_FOLDED
+       uasm_i_dmfc0(p, tmp, C0_BADVADDR); /* get faulting address */
+       uasm_i_ld(p, ptr, 0, ptr); /* get pud pointer */
+       uasm_i_dsrl_safe(p, tmp, tmp, PUD_SHIFT - 3); /* get pud offset in bytes */
+       uasm_i_andi(p, tmp, tmp, (PTRS_PER_PUD - 1) << 3);
+       uasm_i_daddu(p, ptr, ptr, tmp); /* add in pud offset */
+#endif
 #ifndef __PAGETABLE_PMD_FOLDED
        uasm_i_dmfc0(p, tmp, C0_BADVADDR); /* get faulting address */
        uasm_i_ld(p, ptr, 0, ptr); /* get pmd pointer */
@@ -1184,6 +1191,21 @@ build_fast_tlb_refill_handler (u32 **p, struct uasm_label **l,
                uasm_i_ld(p, LOC_PTEP, 0, ptr); /* get pmd pointer */
        }
 
+#ifndef __PAGETABLE_PUD_FOLDED
+       /* get pud offset in bytes */
+       uasm_i_dsrl_safe(p, scratch, tmp, PUD_SHIFT - 3);
+       uasm_i_andi(p, scratch, scratch, (PTRS_PER_PUD - 1) << 3);
+
+       if (use_lwx_insns()) {
+               UASM_i_LWX(p, ptr, scratch, ptr);
+       } else {
+               uasm_i_daddu(p, ptr, ptr, scratch); /* add in pmd offset */
+               UASM_i_LW(p, ptr, 0, ptr);
+       }
+       /* ptr contains a pointer to PMD entry */
+       /* tmp contains the address */
+#endif
+
 #ifndef __PAGETABLE_PMD_FOLDED
        /* get pmd offset in bytes */
        uasm_i_dsrl_safe(p, scratch, tmp, PMD_SHIFT - 3);