From: Andrew Morton <akpm@osdl.org>

Cc: Dave Jones <davej@redhat.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/serial/8250.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff -puN drivers/serial/8250.c~tickle-nmi-watchdog-on-serial-output-fix drivers/serial/8250.c
--- a/drivers/serial/8250.c~tickle-nmi-watchdog-on-serial-output-fix
+++ a/drivers/serial/8250.c
@@ -2224,8 +2224,7 @@ static inline void wait_for_xmitr(struct
 		tmout = 1000000;
 		while (!(serial_in(up, UART_MSR) & UART_MSR_CTS) && --tmout) {
 			udelay(1);
-			if ((tmout % 1000) == 0)
-				touch_nmi_watchdog();
+			touch_nmi_watchdog();
 		}
 	}
 }
_