From 50827fbde161a4ccb05a649752dd221b083f5ea5 Mon Sep 17 00:00:00 2001 From: Feng Tang Date: Thu, 15 Nov 2012 16:03:16 +0800 Subject: [PATCH] serial: mfd: Add nmi_touch_watchdog() into the console write function This is following what 8250 driver is doing in console write function, to avoid the hardware lockup case. v2: incldudes the Signed-off-by: Feng Tang Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/mfd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/tty/serial/mfd.c b/drivers/tty/serial/mfd.c index c4b50af46c44..79fe59b6cc4a 100644 --- a/drivers/tty/serial/mfd.c +++ b/drivers/tty/serial/mfd.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -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; -- GitLab