aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/debug
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2010-05-20 22:04:27 -0400
committerJason Wessel <jason.wessel@windriver.com>2010-05-20 22:04:27 -0400
commit6d90634076200af035f1d9dcc8fc11acefd603e9 (patch)
treef56c723a28006df0425bf662c15e2a3503b9065a /kernel/debug
parentd37d39ae3b4a8f9a21114921fb344fe7cadb1abd (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/debug')
-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 fff59019cca0..b38bb25dbbb3 100644
--- a/kernel/debug/debug_core.c
+++ b/kernel/debug/debug_core.c
@@ -445,6 +445,10 @@ static int kgdb_reenter_check(struct kgdb_state *ks)
445 } 445 }
446 446
447 printk(KERN_CRIT "KGDB: re-enter exception: ALL breakpoints killed\n"); 447 printk(KERN_CRIT "KGDB: re-enter exception: ALL breakpoints killed\n");
448#ifdef CONFIG_KGDB_KDB
449 /* Allow kdb to debug itself one level */
450 return 0;
451#endif
448 dump_stack(); 452 dump_stack();
449 panic("Recursive entry to debugger"); 453 panic("Recursive entry to debugger");
450 454
@@ -489,6 +493,9 @@ acquirelock:
489 */ 493 */
490 atomic_inc(&cpu_in_kgdb[cpu]); 494 atomic_inc(&cpu_in_kgdb[cpu]);
491 495
496 if (exception_level == 1)
497 goto cpu_master_loop;
498
492 /* 499 /*
493 * CPU will loop if it is a slave or request to become a kgdb 500 * CPU will loop if it is a slave or request to become a kgdb
494 * master cpu and acquire the kgdb_active lock: 501 * master cpu and acquire the kgdb_active lock: