From: Andrew Morton <akpm@osdl.org>
Date: Mon, 7 Nov 2005 08:59:13 +0000 (-0800)
Subject: [PATCH] serial console: touch NMI watchdog
X-Git-Tag: v2.6.15-rc1~636
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=78512ece148992a5c00c63fbf4404f3cde635016;p=~emulex%2Finfiniband.git

[PATCH] serial console: touch NMI watchdog

Large console spews from IRQ or local_irq_disable() sections can cause the NMI
watchdog to go off.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 186e96c47b3..98820603e75 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -40,6 +40,7 @@
 #include <linux/serial_core.h>
 #include <linux/serial.h>
 #include <linux/serial_8250.h>
+#include <linux/nmi.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -2208,6 +2209,8 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
 	unsigned int ier;
 	int i;
 
+	touch_nmi_watchdog();
+
 	/*
 	 *	First save the UER then disable the interrupts
 	 */