diff options
| author | Andrew Morton <akpm@osdl.org> | 2005-11-07 00:59:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 07:53:35 -0800 |
| commit | 78512ece148992a5c00c63fbf4404f3cde635016 (patch) | |
| tree | 0493561baab61e79aee4cf23a8ce5b01c360e7d9 | |
| parent | 0ad775dbba12de3b7d25f586efe81ad995ca75a7 (diff) | |
| download | linux-stable-78512ece148992a5c00c63fbf4404f3cde635016.tar.gz linux-stable-78512ece148992a5c00c63fbf4404f3cde635016.tar.bz2 linux-stable-78512ece148992a5c00c63fbf4404f3cde635016.zip | |
[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.c | 3 |
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 @@ #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 */ |