From e22136516f661f37d972f949de5f84d0e01a0935 Mon Sep 17 00:00:00 2001
From: Jason Wessel <jason.wessel@windriver.com>
Date: Fri, 16 Mar 2012 14:20:41 -0500
Subject: [PATCH] --- yaml --- r: 294664 b: refs/heads/master c:
 2366e047840e33928803c0442176fb3991423da8 h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/kernel/debug/debug_core.c | 17 +++++++++++++++++
 trunk/kernel/debug/gdbstub.c    |  7 +++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e20d1eea5aed..c9ec51ca3b82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fbe465efc76044dd87afe764db5464ae61aeabc
+refs/heads/master: 2366e047840e33928803c0442176fb3991423da8
diff --git a/trunk/kernel/debug/debug_core.c b/trunk/kernel/debug/debug_core.c
index 0d7c08784efb..3c1ad4e03543 100644
--- a/trunk/kernel/debug/debug_core.c
+++ b/trunk/kernel/debug/debug_core.c
@@ -41,6 +41,7 @@
 #include <linux/delay.h>
 #include <linux/sched.h>
 #include <linux/sysrq.h>
+#include <linux/reboot.h>
 #include <linux/init.h>
 #include <linux/kgdb.h>
 #include <linux/kdb.h>
@@ -784,6 +785,20 @@ void __init dbg_late_init(void)
 	kdb_init(KDB_INIT_FULL);
 }
 
+static int
+dbg_notify_reboot(struct notifier_block *this, unsigned long code, void *x)
+{
+	if (!dbg_kdb_mode)
+		gdbstub_exit(code);
+	return NOTIFY_DONE;
+}
+
+static struct notifier_block dbg_reboot_notifier = {
+	.notifier_call		= dbg_notify_reboot,
+	.next			= NULL,
+	.priority		= INT_MAX,
+};
+
 static void kgdb_register_callbacks(void)
 {
 	if (!kgdb_io_module_registered) {
@@ -791,6 +806,7 @@ static void kgdb_register_callbacks(void)
 		kgdb_arch_init();
 		if (!dbg_is_early)
 			kgdb_arch_late();
+		register_reboot_notifier(&dbg_reboot_notifier);
 		atomic_notifier_chain_register(&panic_notifier_list,
 					       &kgdb_panic_event_nb);
 #ifdef CONFIG_MAGIC_SYSRQ
@@ -812,6 +828,7 @@ static void kgdb_unregister_callbacks(void)
 	 */
 	if (kgdb_io_module_registered) {
 		kgdb_io_module_registered = 0;
+		unregister_reboot_notifier(&dbg_reboot_notifier);
 		atomic_notifier_chain_unregister(&panic_notifier_list,
 					       &kgdb_panic_event_nb);
 		kgdb_arch_exit();
diff --git a/trunk/kernel/debug/gdbstub.c b/trunk/kernel/debug/gdbstub.c
index 5a155742ae96..ce615e064482 100644
--- a/trunk/kernel/debug/gdbstub.c
+++ b/trunk/kernel/debug/gdbstub.c
@@ -1111,6 +1111,13 @@ void gdbstub_exit(int status)
 	unsigned char checksum, ch, buffer[3];
 	int loop;
 
+	if (!kgdb_connected)
+		return;
+	kgdb_connected = 0;
+
+	if (!dbg_io_ops || dbg_kdb_mode)
+		return;
+
 	buffer[0] = 'W';
 	buffer[1] = hex_asc_hi(status);
 	buffer[2] = hex_asc_lo(status);