1 files changed, 21 insertions, 8 deletions

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index f40f688276c2..eef3001b6890 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1425,14 +1425,27 @@ asmlinkage void cache_parity_error(void)
         printk("Decoded c0_cacheerr: %s cache fault in %s reference.\n",
                reg_val & (1<<30) ? "secondary" : "primary",
                reg_val & (1<<31) ? "data" : "insn");
-        printk("Error bits: %s%s%s%s%s%s%s\n",
-               reg_val & (1<<29) ? "ED " : "",
-               reg_val & (1<<28) ? "ET " : "",
-               reg_val & (1<<26) ? "EE " : "",
-               reg_val & (1<<25) ? "EB " : "",
-               reg_val & (1<<24) ? "EI " : "",
-               reg_val & (1<<23) ? "E1 " : "",
-               reg_val & (1<<22) ? "E0 " : "");
+        if (cpu_has_mips_r2 &&
+            ((current_cpu_data.processor_id && 0xff0000) == PRID_COMP_MIPS)) {
+                pr_err("Error bits: %s%s%s%s%s%s%s%s\n",
+                        reg_val & (1<<29) ? "ED " : "",
+                        reg_val & (1<<28) ? "ET " : "",
+                        reg_val & (1<<27) ? "ES " : "",
+                        reg_val & (1<<26) ? "EE " : "",
+                        reg_val & (1<<25) ? "EB " : "",
+                        reg_val & (1<<24) ? "EI " : "",
+                        reg_val & (1<<23) ? "E1 " : "",
+                        reg_val & (1<<22) ? "E0 " : "");
+        } else {
+                pr_err("Error bits: %s%s%s%s%s%s%s\n",
+                        reg_val & (1<<29) ? "ED " : "",
+                        reg_val & (1<<28) ? "ET " : "",
+                        reg_val & (1<<26) ? "EE " : "",
+                        reg_val & (1<<25) ? "EB " : "",
+                        reg_val & (1<<24) ? "EI " : "",
+                        reg_val & (1<<23) ? "E1 " : "",
+                        reg_val & (1<<22) ? "E0 " : "");
+        }
         printk("IDX: 0x%08x\n", reg_val & ((1<<22)-1));
 
 #if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64)