summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2010-01-15 07:20:23 -0600
committerJason Wessel <jason.wessel@windriver.com>2010-01-15 07:20:23 -0600
commite1ad0cb5a498bb0563b0302f5a6ba8a0ca92c53b (patch)
tree4b6ce647cf1c12a4163a4859523a21d54c78133d /kernel
parent95251035d9a54a8f148a1c940aa4fc661e58105d (diff)
debug_core,kdb: Allow the debug core to process a recursive debug entry
This allows kdb to debug a crash with in the kms code with a single level recursive re-entry. Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/debug/debug_core.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
index e02c5528fc93..344e3328f9f0 100644
--- a/kernel/debug/debug_core.c
+++ b/kernel/debug/debug_core.c
@@ -443,6 +443,10 @@ static int kgdb_reenter_check(struct kgdb_state *ks)
}
printk(KERN_CRIT "KGDB: re-enter exception: ALL breakpoints killed\n");
+#ifdef CONFIG_KGDB_KDB
+ /* Allow kdb to debug itself one level */
+ return 0;
+#endif
dump_stack();
panic("Recursive entry to debugger");
@@ -487,6 +491,9 @@ acquirelock:
smp_wmb();
atomic_set(&cpu_in_kgdb[cpu], 1);
+ if (exception_level == 1)
+ goto cpu_master_loop;
+
/*
* CPU will loop if it is a slave or request to become a kgdb
* master cpu and acquire the kgdb_active lock: