On Fri, Jun 03, 2005 at 03:21:13AM +0100, ths@xxxxxxxxxxxxxx wrote: > Log message: > Fix R4[04]00 hazards breakage. > > diff -urN linux/arch/mips/mm/tlbex-r4k.S linux/arch/mips/mm/tlbex-r4k.S > --- linux/arch/mips/mm/Attic/tlbex-r4k.S 2004/11/25 22:18:38 1.2.2.19 > +++ linux/arch/mips/mm/Attic/tlbex-r4k.S 2005/06/03 02:21:06 1.2.2.20 > @@ -186,6 +186,7 @@ > P_MTC0 k1, CP0_ENTRYLO1 # load it > mtc0_tlbw_hazard > tlbwr # write random tlb entry > + nop > tlbw_eret_hazard I did previously object to a similar patch - why not fix tlbw_eret_hazard instead. Ralf