[Blackfin] arch: Don't oops_in_progress if single step is comming from the kernel

Don't oops_in_progress if single step is comming from the
kernel, which happens if a single step occurs after a exception cause.
This fixes up the remaining issues in the toolchain bug.

Signed-off-by: Robin Getz <robin.getz@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>

diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index c90f16825f98b85cb48f9c9336dab72204e89dc6..5e840727a258363f6ff4a37b0703c0b23eff2507 100644 (file)
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -201,9 +201,9 @@ asmlinkage void trap_c(struct pt_regs *fp)
        /* TODO: check to see if we are in some sort of deferred HWERR
         * that we should be able to recover from, not kernel panic
         */
-       if ((bfin_read_IPEND() & 0xFFC0)
+       if ((bfin_read_IPEND() & 0xFFC0) && (trapnr != VEC_STEP)
 #ifdef CONFIG_KGDB
-               && trapnr != VEC_EXCPT02
+               && (trapnr != VEC_EXCPT02)
 #endif
        ){
                console_verbose();