diff options
| author | akpm@osdl.org <akpm@osdl.org> | 2005-04-16 15:24:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:24:54 -0700 |
| commit | 35faa71484287fc150b8498cd5acae59ad17a356 (patch) | |
| tree | 2460369fc4d6bdf6b30f525b2860f5989ed26858 /arch | |
| parent | 90660ec3c3e3f463a3cc7005213345b6c9ecfab9 (diff) | |
| download | op-kernel-dev-35faa71484287fc150b8498cd5acae59ad17a356.zip op-kernel-dev-35faa71484287fc150b8498cd5acae59ad17a356.tar.gz | |
[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 d87ac64..2707a27 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); } |
