From: Jan Beulich <jbeulich@novell.com>

Suppress triggering a nested panic due to soft lockup detection.

Signed-Off-By: Jan Beulich <jbeulich@novell.com>

diff -Npru /home/jbeulich/tmp/linux-2.6.16-rc1/kernel/panic.c 2.6.16-rc1-panic-softlockup/kernel/panic.c
--- /home/jbeulich/tmp/linux-2.6.16-rc1/kernel/panic.c	2006-01-27 15:10:49.000000000 +0100
+++ 2.6.16-rc1-panic-softlockup/kernel/panic.c	2006-01-25 09:55:53.000000000 +0100
@@ -107,6 +107,7 @@ NORET_TYPE void panic(const char * fmt, 
 		printk(KERN_EMERG "Rebooting in %d seconds..",panic_timeout);
 		for (i = 0; i < panic_timeout*1000; ) {
 			touch_nmi_watchdog();
+			touch_softlockup_watchdog();
 			i += panic_blink(i);
 			mdelay(1);
 			i++;
@@ -130,6 +131,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++;