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/30 11:51:01

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

Log message:
        Avoid tlbw* hazards for the R4600/R4700/R5000.

diff -urN linux/arch/mips/mm/tlbex.c linux/arch/mips/mm/tlbex.c
--- linux/arch/mips/mm/tlbex.c  2005/06/29 10:43:51     1.25
+++ linux/arch/mips/mm/tlbex.c  2005/06/30 10:51:01     1.26
@@ -827,11 +827,16 @@
                i_nop(p);
                break;
 
-       case CPU_R4300:
        case CPU_R4600:
        case CPU_R4700:
        case CPU_R5000:
        case CPU_R5000A:
+               i_nop(p);
+               tlbw(p);
+               i_nop(p);
+               break;
+
+       case CPU_R4300:
        case CPU_5KC:
        case CPU_TX49XX:
        case CPU_AU1000: