diff options
author | akpm@osdl.org <akpm@osdl.org> | 2005-04-16 18:24:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:24:54 -0400 |
commit | 35faa71484287fc150b8498cd5acae59ad17a356 (patch) | |
tree | 2460369fc4d6bdf6b30f525b2860f5989ed26858 /arch | |
parent | 90660ec3c3e3f463a3cc7005213345b6c9ecfab9 (diff) |
[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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86_64/kernel/traps.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c index d87ac6496cc2..2707a27b81cd 100644 --- a/arch/x86_64/kernel/traps.c +++ b/arch/x86_64/kernel/traps.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <linux/interrupt.h> | 28 | #include <linux/interrupt.h> |
29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
30 | #include <linux/moduleparam.h> | 30 | #include <linux/moduleparam.h> |
31 | #include <linux/nmi.h> | ||
31 | 32 | ||
32 | #include <asm/system.h> | 33 | #include <asm/system.h> |
33 | #include <asm/uaccess.h> | 34 | #include <asm/uaccess.h> |
@@ -243,6 +244,7 @@ void show_stack(struct task_struct *tsk, unsigned long * rsp) | |||
243 | if (i && ((i % 4) == 0)) | 244 | if (i && ((i % 4) == 0)) |
244 | printk("\n "); | 245 | printk("\n "); |
245 | printk("%016lx ", *stack++); | 246 | printk("%016lx ", *stack++); |
247 | touch_nmi_watchdog(); | ||
246 | } | 248 | } |
247 | show_trace((unsigned long *)rsp); | 249 | show_trace((unsigned long *)rsp); |
248 | } | 250 | } |