diff options
| author | Jason Wessel <jason.wessel@windriver.com> | 2010-07-22 02:27:07 +0200 |
|---|---|---|
| committer | Jason Wessel <jason.wessel@windriver.com> | 2010-07-22 02:27:07 +0200 |
| commit | b0679c63db655fa12007558e267bc0eb1d486fdb (patch) | |
| tree | b210de833621055d02c2114b77d419f09ea73a36 /kernel | |
| parent | Fix merge regression from external kdb to upstream kdb (diff) | |
| download | linux-b0679c63db655fa12007558e267bc0eb1d486fdb.tar.xz linux-b0679c63db655fa12007558e267bc0eb1d486fdb.zip | |
debug_core,kdb: fix kgdb_connected bit set in the wrong place
Immediately following an exit from the kdb shell the kgdb_connected
variable should be set to zero, unless there are breakpoints planted.
If the kgdb_connected variable is not zeroed out with kdb, it is
impossible to turn off kdb.
This patch is merely a work around for now, the real fix will check
for the breakpoints.
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/debug/debug_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c index 5cb7cd1de10c..8bc5eeffec8a 100644 --- a/kernel/debug/debug_core.c +++ b/kernel/debug/debug_core.c @@ -605,13 +605,13 @@ cpu_master_loop: if (dbg_kdb_mode) { kgdb_connected = 1; error = kdb_stub(ks); + kgdb_connected = 0; } else { error = gdb_serial_stub(ks); } if (error == DBG_PASS_EVENT) { dbg_kdb_mode = !dbg_kdb_mode; - kgdb_connected = 0; } else if (error == DBG_SWITCH_CPU_EVENT) { dbg_cpu_switch(cpu, dbg_switch_cpu); goto cpu_loop; |