From ececb0805695acdba495208043b5c34172e1a8f2 Mon Sep 17 00:00:00 2001 From: Robin Getz Date: Thu, 9 Jul 2009 15:11:52 +0000 Subject: [PATCH] --- yaml --- r: 155589 b: refs/heads/master c: f574a76a3b19848ac61814756716e26f85f2c3f7 h: refs/heads/master i: 155587: b67ac6ff9d4424caea176a309406e9a6c298cefb 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 098547f54d8f..3a85a1c6997f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c70c754ff916cedd969a73549799d2167ffefcd6 +refs/heads/master: f574a76a3b19848ac61814756716e26f85f2c3f7 diff --git a/trunk/arch/blackfin/kernel/traps.c b/trunk/arch/blackfin/kernel/traps.c index 9efac0f2e2ce..bf2b2d1f8ae5 100644 --- a/trunk/arch/blackfin/kernel/traps.c +++ b/trunk/arch/blackfin/kernel/traps.c @@ -621,7 +621,8 @@ asmlinkage void trap_c(struct pt_regs *fp) } if ((ANOMALY_05000461 && trapnr == VEC_HWERR && !access_ok(VERIFY_READ, fp->pc, 8)) || - (ANOMALY_05000281 && trapnr == VEC_HWERR)) + (ANOMALY_05000281 && trapnr == VEC_HWERR) || + (ANOMALY_05000189 && (trapnr == VEC_CPLB_I_VL || trapnr == VEC_CPLB_VL))) fp->pc = SAFE_USER_INSTRUCTION; traps_done: