From: Dave Jones <davej@redhat.com>
Date: Thu, 7 Dec 2006 01:14:12 +0000 (+0100)
Subject: [PATCH] i386: touch softlockup during backtracing
X-Git-Tag: v2.6.20-rc1~145^2^2~8^2~29
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a36df98ab1cdd8a9e7daa4c1b5c48ffa2ad6ea09;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index 1d48a75fa33..86d8476be4f 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);