aboutsummaryrefslogtreecommitdiff
path: root/arch/blackfin/kernel
diff options
context:
space:
mode:
authorRobin Getz2008-01-10 17:57:56 +0800
committerBryan Wu2008-01-10 17:57:56 +0800
commit6b5eace2f15b53d5a6849078d22e78db77625929 (patch)
treed2c74b2f7c963ff1c3b419513f967a196678ce42 /arch/blackfin/kernel
parenta546b0ac5988348446e4fd5987df699b4c9b1f2a (diff)
[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>
Diffstat (limited to 'arch/blackfin/kernel')
-rw-r--r--arch/blackfin/kernel/traps.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index c90f16825f98..5e840727a258 100644
--- 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();