Commit 004429956b4875e6bc2a31833f75363ce48cbea9
Committed by
Linus Torvalds
1 parent
b311e921b3
handle recursive calls to bust_spinlocks()
Various architectures may call bust_spinlocks() recursively; the function itself, however, doesn't appear to be meant to be called in this manner. Nevertheless, this doesn't appear to be a problem as long as bust_spinlocks(0) doesn't get called twice in a row (otherwise, unblank_screen() may enter the scheduler). However, at least on i386 die() has been capable of returning (and on other architectures this should really be that way, too) when notify_die() returns NOTIFY_STOP. Short of getting a reply to a respective query, this patch makes bust_spinlocks() increment/decrement oops_in_progress, and wake klogd only when the count drops back to zero. Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff
lib/bust_spinlocks.c
... | ... | @@ -17,13 +17,13 @@ |
17 | 17 | void __attribute__((weak)) bust_spinlocks(int yes) |
18 | 18 | { |
19 | 19 | if (yes) { |
20 | - oops_in_progress = 1; | |
20 | + ++oops_in_progress; | |
21 | 21 | } else { |
22 | 22 | #ifdef CONFIG_VT |
23 | 23 | unblank_screen(); |
24 | 24 | #endif |
25 | - oops_in_progress = 0; | |
26 | - wake_up_klogd(); | |
25 | + if (--oops_in_progress == 0) | |
26 | + wake_up_klogd(); | |
27 | 27 | } |
28 | 28 | } |