Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6b5eace2f15b53d5a6849078d22e78db77625929
Commit: 6b5eace2f15b53d5a6849078d22e78db77625929
Parent: a546b0ac5988348446e4fd5987df699b4c9b1f2a
Author: Robin Getz <[EMAIL PROTECTED]>
AuthorDate: Thu Jan 10 17:57:56 2008 +0800
Committer: Bryan Wu <[EMAIL PROTECTED]>
CommitDate: Thu Jan 10 17:57:56 2008 +0800
[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 <[EMAIL PROTECTED]>
Signed-off-by: Bryan Wu <[EMAIL PROTECTED]>
---
arch/blackfin/kernel/traps.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index c90f168..5e84072 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();
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
