diff options
| author | Feng Tang <feng.tang@intel.com> | 2012-11-15 09:03:16 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-16 02:06:10 +0100 |
| commit | 50827fbde161a4ccb05a649752dd221b083f5ea5 (patch) | |
| tree | 2123ab7566361f26aab6641047444025944b3a83 /drivers/tty/serial/mfd.c | |
| parent | serial: bfin-uart: avoid dead lock in rx irq handler in smp kernel (diff) | |
| download | linux-50827fbde161a4ccb05a649752dd221b083f5ea5.tar.xz linux-50827fbde161a4ccb05a649752dd221b083f5ea5.zip | |
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 <linux/nmi.h>
Signed-off-by: Feng Tang <feng.tang@intel.com>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/mfd.c')
| -rw-r--r-- | drivers/tty/serial/mfd.c | 3 |
1 files changed, 3 insertions, 0 deletions
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 <linux/serial_mfd.h> #include <linux/dma-mapping.h> #include <linux/pci.h> +#include <linux/nmi.h> #include <linux/io.h> #include <linux/debugfs.h> #include <linux/pm_runtime.h> @@ -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; |