From: Jan Beulich <jbeulich@novell.com>
Date: Fri, 10 Feb 2006 09:51:11 +0000 (-0800)
Subject: [PATCH] prevent recursive panic from softlockup watchdog
X-Git-Tag: v2.6.16-rc3~37
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c22db9412736204b25aeba19d18e5ea922f7d632;p=linux-2.6-omap-h63xx.git

[PATCH] prevent recursive panic from softlockup watchdog

When panic_timeout is zero, suppress triggering a nested panic due to soft
lockup detection.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/kernel/panic.c b/kernel/panic.c
index c5c4ab25583..126dc43f1c7 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -130,6 +130,7 @@ NORET_TYPE void panic(const char * fmt, ...)
 #endif
 	local_irq_enable();
 	for (i = 0;;) {
+		touch_softlockup_watchdog();
 		i += panic_blink(i);
 		mdelay(1);
 		i++;