From: Sonic Zhang <sonic.zhang@analog.com>
Date: Tue, 19 Jan 2010 11:13:12 +0000 (-0500)
Subject: serial: bfin_5xx: kgdboc should accept gdb break only when it is active
X-Git-Tag: v2.6.34-rc1~216^2~14
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=cdc592d5d496e5c813d9632d0d1e334658927af7;p=~emulex%2Finfiniband.git

serial: bfin_5xx: kgdboc should accept gdb break only when it is active

If we always check for gdb breaks even when it isn't active, we get false
positives on normal code and the system panics.

URL: http://blackfin.uclinux.org/gf/tracker/5277

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c
index b5a9b374dad..6b8795557b3 100644
--- a/drivers/serial/bfin_5xx.c
+++ b/drivers/serial/bfin_5xx.c
@@ -237,7 +237,8 @@ static void bfin_serial_rx_chars(struct bfin_serial_port *uart)
 
 #if defined(CONFIG_KGDB_SERIAL_CONSOLE) || \
 	defined(CONFIG_KGDB_SERIAL_CONSOLE_MODULE)
-	if (kgdb_connected && kgdboc_port_line == uart->port.line)
+	if (kgdb_connected && kgdboc_port_line == uart->port.line
+		&& kgdboc_break_enabled)
 		if (ch == 0x3) {/* Ctrl + C */
 			kgdb_breakpoint();
 			return;