diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-07 02:14:12 +0100 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-12-07 02:14:12 +0100 |
| commit | a36df98ab1cdd8a9e7daa4c1b5c48ffa2ad6ea09 (patch) | |
| tree | 3b37f0f255cb9ec277188c87994c7c26d9a38c8f /arch/i386/kernel/traps.c | |
| parent | [PATCH] x86-64: Fix kobject_init() WARN_ON on resume from disk (diff) | |
| download | linux-a36df98ab1cdd8a9e7daa4c1b5c48ffa2ad6ea09.tar.xz linux-a36df98ab1cdd8a9e7daa4c1b5c48ffa2ad6ea09.zip | |
[PATCH] i386: touch softlockup during backtracing
Sometimes the soft watchdog fires after we're done oopsing.
See http://projects.info-pull.com/mokb/MOKB-25-11-2006.html for an example.
AK: changed to touch_nmi_watchdog()
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/i386/kernel/traps.c')
| -rw-r--r-- | arch/i386/kernel/traps.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c index 1d48a75fa338..86d8476be4fe 100644 --- a/arch/i386/kernel/traps.c +++ b/arch/i386/kernel/traps.c @@ -29,6 +29,7 @@ #include <linux/kexec.h> #include <linux/unwind.h> #include <linux/uaccess.h> +#include <linux/nmi.h> #ifdef CONFIG_EISA #include <linux/ioport.h> @@ -248,6 +249,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, stack = (unsigned long*)context->previous_esp; if (!stack) break; + touch_nmi_watchdog(); } } EXPORT_SYMBOL(dump_trace); |