The patch titled
     i386: touch softlockup during stack unwinding
has been removed from the -mm tree.  Its filename was
     i386-touch-softlockup-during-stack-unwinding.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: i386: touch softlockup during stack unwinding
From: Dave Jones <[EMAIL PROTECTED]>

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.
The NMI watchdog could also fire, so tickle both watchdogs.

Signed-off-by: Dave Jones <[EMAIL PROTECTED]>
Cc: Andi Kleen <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 arch/i386/kernel/traps.c |    2 ++
 1 files changed, 2 insertions(+)

diff -puN arch/i386/kernel/traps.c~i386-touch-softlockup-during-stack-unwinding 
arch/i386/kernel/traps.c
--- a/arch/i386/kernel/traps.c~i386-touch-softlockup-during-stack-unwinding
+++ a/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
                stack = (unsigned long*)context->previous_esp;
                if (!stack)
                        break;
+               touch_nmi_watchdog();
        }
 }
 EXPORT_SYMBOL(dump_trace);
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

origin.patch
git-agpgart.patch
git-cpufreq.patch
remove-hotplug-cpu-crap-from-cpufreq.patch
add-missing-libsas-include-to-fix-s390-compilation.patch
swsusp-support-i386-systems-with-pae-or-without-pse.patch
more-list-debugging-context.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to