diff options
| author | Maciej W. Rozycki <macro@linux-mips.org> | 2005-06-13 20:12:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 19:31:21 +0100 |
| commit | d925c262dd8bee2202b0d1b85ce0b332f48dd34b (patch) | |
| tree | d62cded4387504ff0d4db5e737261f5fd50c1af4 /arch/mips/mm | |
| parent | 9678e28b1ab931c35567cb15927b8c5e474934c3 (diff) | |
Fill R3k load delay slots properly.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mm')
| -rw-r--r-- | arch/mips/mm/tlbex.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index 2e90c1d2d05..68d24b80053 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c @@ -1486,6 +1486,7 @@ static void __init build_r3000_tlb_load_handler(void) build_r3000_tlbchange_handler_head(&p, K0, K1); build_pte_present(&p, &l, &r, K0, K1, label_nopage_tlbl); + i_nop(&p); /* load delay */ build_make_valid(&p, &r, K0, K1); build_r3000_pte_reload(&p, K1); build_r3000_tlb_write(&p, &l, &r, K0); @@ -1527,6 +1528,7 @@ static void __init build_r3000_tlb_store_handler(void) build_r3000_tlbchange_handler_head(&p, K0, K1); build_pte_writable(&p, &l, &r, K0, K1, label_nopage_tlbs); + i_nop(&p); /* load delay */ build_make_write(&p, &r, K0, K1); build_r3000_pte_reload(&p, K1); build_r3000_tlb_write(&p, &l, &r, K0); @@ -1568,6 +1570,7 @@ static void __init build_r3000_tlb_modify_handler(void) build_r3000_tlbchange_handler_head(&p, K0, K1); build_pte_modifiable(&p, &l, &r, K0, K1, label_nopage_tlbm); + i_nop(&p); /* load delay */ build_make_write(&p, &r, K0, K1); build_r3000_pte_reload(&p, K1); i_tlbwi(&p); |