From: akpm@osdl.org <akpm@osdl.org>
Date: Sat, 16 Apr 2005 22:24:54 +0000 (-0700)
Subject: [PATCH] x86_64 show_stack(): call touch_nmi_watchdog
X-Git-Tag: v2.6.12-rc3~174
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35faa71484287fc150b8498cd5acae59ad17a356;p=linux-2.6

[PATCH] x86_64 show_stack(): call touch_nmi_watchdog

I had strange NMI watchdog timeouts running sysrq-T across 9600-baud serial.


Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c
index d87ac6496c..2707a27b81 100644
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
@@ -28,6 +28,7 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/nmi.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
@@ -243,6 +244,7 @@ void show_stack(struct task_struct *tsk, unsigned long * rsp)
 		if (i && ((i % 4) == 0))
 			printk("\n       ");
 		printk("%016lx ", *stack++);
+		touch_nmi_watchdog();
 	}
 	show_trace((unsigned long *)rsp);
 }