aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/mm/tlbex.c
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@linux-mips.org>2005-06-30 06:51:01 -0400
committerRalf Baechle <ralf@linux-mips.org>2005-10-29 14:31:34 -0400
commit2c93e12cfec8cc668d4a2a2c8576dedabb7c69c8 (patch)
tree9081ae8c3b5c87ecbc6f1d94c85516ca767e907a /arch/mips/mm/tlbex.c
parentc3455b0efc2b5b1bdc755602f77ce7f43725bf61 (diff)
Avoid tlbw* hazards for the R4600/R4700/R5000.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mm/tlbex.c')
-rw-r--r--arch/mips/mm/tlbex.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 19bf0cc40917..3b737fafb9b5 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -827,11 +827,16 @@ static __init void build_tlb_write_entry(u32 **p, struct label **l,
827 i_nop(p); 827 i_nop(p);
828 break; 828 break;
829 829
830 case CPU_R4300:
831 case CPU_R4600: 830 case CPU_R4600:
832 case CPU_R4700: 831 case CPU_R4700:
833 case CPU_R5000: 832 case CPU_R5000:
834 case CPU_R5000A: 833 case CPU_R5000A:
834 i_nop(p);
835 tlbw(p);
836 i_nop(p);
837 break;
838
839 case CPU_R4300:
835 case CPU_5KC: 840 case CPU_5KC:
836 case CPU_TX49XX: 841 case CPU_TX49XX:
837 case CPU_AU1000: 842 case CPU_AU1000: