From f9f1e8170f5ab8960877313fc2a97b99be2711c4 Mon Sep 17 00:00:00 2001
From: Robin Getz <robin.getz@analog.com>
Date: Mon, 22 Jun 2009 20:23:48 +0000
Subject: [PATCH] --- yaml --- r: 155575 b: refs/heads/master c:
 0e4edcf0b0f7d96c4be7788b13bee82e4d3ba0ce h: refs/heads/master i:   155573:
 4825da2b701074b9a9737492c4a9ee172d389c9a   155571:
 71b0f59f7e0e4f73ccd728a275bbcac512ef7ff8   155567:
 4461cdaec23c201a91b3ee5157368e654c17fca5 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/blackfin/kernel/traps.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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: