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

 25-akpm/arch/x86_64/kernel/traps.c |    2 ++
 1 files changed, 2 insertions(+)

diff -puN arch/x86_64/kernel/traps.c~x86_64-show_stack-touch_nmi_watchdog arch/x86_64/kernel/traps.c
--- 25/arch/x86_64/kernel/traps.c~x86_64-show_stack-touch_nmi_watchdog	2005-03-30 23:32:51.000000000 -0800
+++ 25-akpm/arch/x86_64/kernel/traps.c	2005-03-30 23:39:15.000000000 -0800
@@ -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,
 		if (i && ((i % 4) == 0))
 			printk("\n       ");
 		printk("%016lx ", *stack++);
+		touch_nmi_watchdog();
 	}
 	show_trace((unsigned long *)rsp);
 }
_