From: Thiemo Seufer <ths@networkno.de>
Date: Fri, 9 Sep 2005 17:11:50 +0000 (+0000)
Subject: R4600 v2.0 needs a nop before tlbp.
X-Git-Tag: v2.6.15-rc1~731^2~1^2~83
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5b4d9563b3dc43d3b5df2422baecd2d4b77750a;p=linux-2.6

R4600 v2.0 needs a nop before tlbp.

Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index e8a8ffd036..240537d263 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -779,6 +779,8 @@ static __initdata u32 final_handler[64];
 static __init void __attribute__((unused)) build_tlb_probe_entry(u32 **p)
 {
 	switch (current_cpu_data.cputype) {
+	/* Found by experiment: R4600 v2.0 needs this, too.  */
+	case CPU_R4600:
 	case CPU_R5000:
 	case CPU_R5000A:
 	case CPU_NEVADA: