]> nv-tegra.nvidia Code Review - linux-3.10.git/commitdiff
[PATCH] x86_64 show_stack(): call touch_nmi_watchdog
authorakpm@osdl.org <akpm@osdl.org>
Sat, 16 Apr 2005 22:24:54 +0000 (15:24 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 16 Apr 2005 22:24:54 +0000 (15:24 -0700)
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>
arch/x86_64/kernel/traps.c

index d87ac6496cc2ab1145302bc17a6f5a882a6dc633..2707a27b81cd5efa4bf1b2ea5de729b440c05b2b 100644 (file)
@@ -28,6 +28,7 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/nmi.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.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++);
                if (i && ((i % 4) == 0))
                        printk("\n       ");
                printk("%016lx ", *stack++);
+               touch_nmi_watchdog();
        }
        show_trace((unsigned long *)rsp);
 }
        }
        show_trace((unsigned long *)rsp);
 }