1 files changed, 13 insertions, 1 deletions

diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 03eb0ef91580..22ba108d708d 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -449,8 +449,20 @@ static void __cpuinit build_tlb_write_entry(u32 **p, struct uasm_label **l,
         }
 
         if (cpu_has_mips_r2) {
-                if (cpu_has_mips_r2_exec_hazard)
+                /*
+                 * The architecture spec says an ehb is required here,
+                 * but a number of cores do not have the hazard and
+                 * using an ehb causes an expensive pipeline stall.
+                 */
+                switch (current_cpu_type()) {
+                case CPU_M14KC:
+                case CPU_74K:
+                        break;
+
+                default:
                         uasm_i_ehb(p);
+                        break;
+                }
                 tlbw(p);
                 return;
         }