git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7a8ef1c
)
[PATCH] prevent recursive panic from softlockup watchdog
author
Jan Beulich
<jbeulich@novell.com>
Fri, 10 Feb 2006 09:51:11 +0000
(
01:51
-0800)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Fri, 10 Feb 2006 16:13:12 +0000
(08:13 -0800)
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>
kernel/panic.c
patch
|
blob
|
history
diff --git
a/kernel/panic.c
b/kernel/panic.c
index
c5c4ab2
..
126dc43
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;;) {
#endif
local_irq_enable();
for (i = 0;;) {
+ touch_softlockup_watchdog();
i += panic_blink(i);
mdelay(1);
i++;
i += panic_blink(i);
mdelay(1);
i++;