diff options
| author | Jan Beulich <jbeulich@novell.com> | 2006-02-10 10:51:11 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-10 17:13:12 +0100 |
| commit | c22db9412736204b25aeba19d18e5ea922f7d632 (patch) | |
| tree | 22a3c9526ebdd1562f4160a09389011ef6039ee7 /kernel | |
| parent | [PATCH] x86: don't initialise cpu_possible_map to all ones (diff) | |
| download | linux-c22db9412736204b25aeba19d18e5ea922f7d632.tar.xz linux-c22db9412736204b25aeba19d18e5ea922f7d632.zip | |
[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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/panic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index c5c4ab255834..126dc43f1c74 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++; |