From 7310adc4d8c6a8095c9a2de06e64190cc1f2ebc3 Mon Sep 17 00:00:00 2001
From: Feng Tang <feng.tang@intel.com>
Date: Thu, 15 Nov 2012 16:03:16 +0800
Subject: [PATCH] --- yaml --- r: 338412 b: refs/heads/master c:
 50827fbde161a4ccb05a649752dd221b083f5ea5 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/tty/serial/mfd.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 86e971dd740b..2be46d4966a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9642dbe73c8a3b55a812253fcb9add9eeed4ca81
+refs/heads/master: 50827fbde161a4ccb05a649752dd221b083f5ea5
diff --git a/trunk/drivers/tty/serial/mfd.c b/trunk/drivers/tty/serial/mfd.c
index c4b50af46c44..79fe59b6cc4a 100644
--- a/trunk/drivers/tty/serial/mfd.c
+++ b/trunk/drivers/tty/serial/mfd.c
@@ -36,6 +36,7 @@
 #include <linux/serial_mfd.h>
 #include <linux/dma-mapping.h>
 #include <linux/pci.h>
+#include <linux/nmi.h>
 #include <linux/io.h>
 #include <linux/debugfs.h>
 #include <linux/pm_runtime.h>
@@ -1113,6 +1114,8 @@ serial_hsu_console_write(struct console *co, const char *s, unsigned int count)
 	unsigned int ier;
 	int locked = 1;
 
+	touch_nmi_watchdog();
+
 	local_irq_save(flags);
 	if (up->port.sysrq)
 		locked = 0;