aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-11-07 03:59:13 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 10:53:35 -0500
commit78512ece148992a5c00c63fbf4404f3cde635016 (patch)
tree0493561baab61e79aee4cf23a8ce5b01c360e7d9
parent0ad775dbba12de3b7d25f586efe81ad995ca75a7 (diff)
[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>
-rw-r--r--drivers/serial/8250.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 186e96c47b3d..98820603e75f 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -40,6 +40,7 @@
40#include <linux/serial_core.h> 40#include <linux/serial_core.h>
41#include <linux/serial.h> 41#include <linux/serial.h>
42#include <linux/serial_8250.h> 42#include <linux/serial_8250.h>
43#include <linux/nmi.h>
43 44
44#include <asm/io.h> 45#include <asm/io.h>
45#include <asm/irq.h> 46#include <asm/irq.h>
@@ -2208,6 +2209,8 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
2208 unsigned int ier; 2209 unsigned int ier;
2209 int i; 2210 int i;
2210 2211
2212 touch_nmi_watchdog();
2213
2211 /* 2214 /*
2212 * First save the UER then disable the interrupts 2215 * First save the UER then disable the interrupts
2213 */ 2216 */