]> err.no Git - linux-2.6/commitdiff
Avoid tlbw* hazards for the R4600/R4700/R5000.
authorMaciej W. Rozycki <macro@linux-mips.org>
Thu, 30 Jun 2005 10:51:01 +0000 (10:51 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Sat, 29 Oct 2005 18:31:34 +0000 (19:31 +0100)
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/mm/tlbex.c

index 19bf0cc40917dba6a2210206d39e99ebe51758e6..3b737fafb9b50c279244fd7ff4ae198b3dace4bd 100644 (file)
@@ -827,11 +827,16 @@ static __init void build_tlb_write_entry(u32 **p, struct label **l,
                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: