Skip to content

Commit

Permalink
serial: mfd: Add nmi_touch_watchdog() into the console write function
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Feng Tang authored and Greg Kroah-Hartman committed Nov 16, 2012
1 parent 9642dbe commit 50827fb
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/tty/serial/mfd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 50827fb

Please sign in to comment.