Merge git://oss.sgi.com:8090/oss/git/rc-fixes

[deliverable/linux.git] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index c5c4ab255834e5760715e3f7ce4871a2a943245e..126dc43f1c744a4d46e6e8d20610ac9f54744877 100644 (file)
--- 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++;