Commit 78512ece authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0ad775db
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include <linux/serial_core.h> #include <linux/serial_core.h>
#include <linux/serial.h> #include <linux/serial.h>
#include <linux/serial_8250.h> #include <linux/serial_8250.h>
#include <linux/nmi.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
...@@ -2208,6 +2209,8 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count) ...@@ -2208,6 +2209,8 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
unsigned int ier; unsigned int ier;
int i; int i;
touch_nmi_watchdog();
/* /*
* First save the UER then disable the interrupts * First save the UER then disable the interrupts
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment