|
|
|
@ -34,7 +34,7 @@ |
|
|
|
|
|
|
|
|
|
--- a/arch/mips/mm/tlbex.c
|
|
|
|
|
+++ b/arch/mips/mm/tlbex.c
|
|
|
|
|
@@ -711,6 +711,9 @@ build_get_pgde32(u32 **p, unsigned int t
|
|
|
|
|
@@ -712,6 +712,9 @@ build_get_pgde32(u32 **p, unsigned int t
|
|
|
|
|
#endif
|
|
|
|
|
uasm_i_addu(p, ptr, tmp, ptr);
|
|
|
|
|
#else
|
|
|
|
@ -44,7 +44,7 @@ |
|
|
|
|
UASM_i_LA_mostly(p, ptr, pgdc);
|
|
|
|
|
#endif
|
|
|
|
|
uasm_i_mfc0(p, tmp, C0_BADVADDR); /* get faulting address */
|
|
|
|
|
@@ -872,12 +875,12 @@ static void __cpuinit build_r4000_tlb_re
|
|
|
|
|
@@ -873,12 +876,12 @@ static void __cpuinit build_r4000_tlb_re
|
|
|
|
|
/* No need for uasm_i_nop */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -60,7 +60,7 @@ |
|
|
|
|
build_get_pgde32(&p, K0, K1); /* get pgd in K1 */
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
@@ -889,6 +892,9 @@ static void __cpuinit build_r4000_tlb_re
|
|
|
|
|
@@ -890,6 +893,9 @@ static void __cpuinit build_r4000_tlb_re
|
|
|
|
|
build_update_entries(&p, K0, K1);
|
|
|
|
|
build_tlb_write_entry(&p, &l, &r, tlb_random);
|
|
|
|
|
uasm_l_leave(&l, p);
|
|
|
|
@ -70,7 +70,7 @@ |
|
|
|
|
uasm_i_eret(&p); /* return from trap */
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_HUGETLB_PAGE
|
|
|
|
|
@@ -1325,12 +1331,12 @@ build_r4000_tlbchange_handler_head(u32 *
|
|
|
|
|
@@ -1326,12 +1332,12 @@ build_r4000_tlbchange_handler_head(u32 *
|
|
|
|
|
struct uasm_reloc **r, unsigned int pte,
|
|
|
|
|
unsigned int ptr)
|
|
|
|
|
{
|
|
|
|
@ -86,7 +86,7 @@ |
|
|
|
|
build_get_pgde32(p, pte, ptr); /* get pgd in ptr */
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
@@ -1367,6 +1373,9 @@ build_r4000_tlbchange_handler_tail(u32 *
|
|
|
|
|
@@ -1368,6 +1374,9 @@ build_r4000_tlbchange_handler_tail(u32 *
|
|
|
|
|
build_update_entries(p, tmp, ptr);
|
|
|
|
|
build_tlb_write_entry(p, l, r, tlb_indexed);
|
|
|
|
|
uasm_l_leave(l, *p);
|
|
|
|
|