CVS Update@linux-mips.org: linux

[macro@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     macro@ftp.linux-mips.org        05/06/13 21:12:01

Modified files:
        arch/mips/mm   : tlbex.c 

Log message:
        Fill R3k load delay slots properly.

diff -urN linux/arch/mips/mm/tlbex.c linux/arch/mips/mm/tlbex.c
--- linux/arch/mips/mm/tlbex.c  2005/06/13 20:09:32     1.21
+++ linux/arch/mips/mm/tlbex.c  2005/06/13 20:12:01     1.22
@@ -1486,6 +1486,7 @@
 
        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 @@
 
        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 @@
 
        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);