diff --git a/[refs] b/[refs] index c3632d0db978..777e30fabdbb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3455b0efc2b5b1bdc755602f77ce7f43725bf61 +refs/heads/master: 2c93e12cfec8cc668d4a2a2c8576dedabb7c69c8 diff --git a/trunk/arch/mips/mm/tlbex.c b/trunk/arch/mips/mm/tlbex.c index 19bf0cc40917..3b737fafb9b5 100644 --- a/trunk/arch/mips/mm/tlbex.c +++ b/trunk/arch/mips/mm/tlbex.c @@ -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: