diff --git a/[refs] b/[refs] index 5445688bd87e..a92ab975f813 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a8ef1cb774e5438d292365626f9b96616283706 +refs/heads/master: c22db9412736204b25aeba19d18e5ea922f7d632 diff --git a/trunk/kernel/panic.c b/trunk/kernel/panic.c index c5c4ab255834..126dc43f1c74 100644 --- a/trunk/kernel/panic.c +++ b/trunk/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++;