From f0b73e116e330ab8435aadf424fefdc53f2d4695 Mon Sep 17 00:00:00 2001
From: Jason Wessel <jason.wessel@windriver.com>
Date: Wed, 21 Jul 2010 19:27:07 -0500
Subject: [PATCH] --- yaml --- r: 201156 b: refs/heads/master c:
 b0679c63db655fa12007558e267bc0eb1d486fdb h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/kernel/debug/debug_core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c270925e7148..cfcfbff84e74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e8b624fcaebf9c237b5be9116f4424bf168e6d1
+refs/heads/master: b0679c63db655fa12007558e267bc0eb1d486fdb
diff --git a/trunk/kernel/debug/debug_core.c b/trunk/kernel/debug/debug_core.c
index 5cb7cd1de10c..8bc5eeffec8a 100644
--- a/trunk/kernel/debug/debug_core.c
+++ b/trunk/kernel/debug/debug_core.c
@@ -605,13 +605,13 @@ static int kgdb_cpu_enter(struct kgdb_state *ks, struct pt_regs *regs)
 		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;