1 files changed, 6 insertions, 3 deletions

diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index 8a1caf2bb5b..bf2b2d1f8ae 100644
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -570,11 +570,12 @@ asmlinkage void trap_c(struct pt_regs *fp)
         if (kernel_mode_regs(fp) || (current && !current->mm)) {
                 console_verbose();
                 oops_in_progress = 1;
-                if (strerror)
-                        verbose_printk(strerror);
         }
 
         if (sig != SIGTRAP) {
+                if (strerror)
+                        verbose_printk(strerror);
+
                 dump_bfin_process(fp);
                 dump_bfin_mem(fp);
                 show_regs(fp);
@@ -619,7 +620,9 @@ asmlinkage void trap_c(struct pt_regs *fp)
                 force_sig_info(sig, &info, current);
         }
 
-        if (ANOMALY_05000461 && trapnr == VEC_HWERR && !access_ok(VERIFY_READ, fp->pc, 8))
+        if ((ANOMALY_05000461 && trapnr == VEC_HWERR && !access_ok(VERIFY_READ, fp->pc, 8)) ||
+            (ANOMALY_05000281 && trapnr == VEC_HWERR) ||
+            (ANOMALY_05000189 && (trapnr == VEC_CPLB_I_VL || trapnr == VEC_CPLB_VL)))
                 fp->pc = SAFE_USER_INSTRUCTION;
 
  traps_done: