---

yaml --- r: 77392 b: refs/heads/master c: 6b5eace h: refs/heads/master v: v3
git-mirror · Jan 10, 2008 · 100c1e9 · 100c1e9
1 parent 74172f3
commit 100c1e9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a546b0ac5988348446e4fd5987df699b4c9b1f2a
+refs/heads/master: 6b5eace2f15b53d5a6849078d22e78db77625929
diff --git a/trunk/arch/blackfin/kernel/traps.c b/trunk/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();