diff --git a/[refs] b/[refs]
index 96b60b335816..b8dd6e1e270c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 976119bc5d2253bb47f3255ee178ce1ee605fd3c
+refs/heads/master: 0e4edcf0b0f7d96c4be7788b13bee82e4d3ba0ce
diff --git a/trunk/arch/blackfin/kernel/traps.c b/trunk/arch/blackfin/kernel/traps.c
index 8a1caf2bb5b9..664de56296cb 100644
--- a/trunk/arch/blackfin/kernel/traps.c
+++ b/trunk/arch/blackfin/kernel/traps.c
@@ -619,7 +619,8 @@ 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))
 		fp->pc = SAFE_USER_INSTRUCTION;
 
  traps_done: