Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux.git] / lib / bust_spinlocks.c

diff --git a/lib/bust_spinlocks.c b/lib/bust_spinlocks.c
index accb3565816993630ab98bc7818f3afe75307fa5..9681d54b95d127878405d5ff0afec6fcc575fbae 100644 (file)
--- a/lib/bust_spinlocks.c
+++ b/lib/bust_spinlocks.c
@@ -12,18 +12,20 @@
 #include <linux/tty.h>
 #include <linux/wait.h>
 #include <linux/vt_kern.h>
+#include <linux/console.h>
 
 
 void __attribute__((weak)) bust_spinlocks(int yes)
 {
        if (yes) {
-               oops_in_progress = 1;
+               ++oops_in_progress;
        } else {
 #ifdef CONFIG_VT
                unblank_screen();
 #endif
-               oops_in_progress = 0;
-               wake_up_klogd();
+               console_unblank();
+               if (--oops_in_progress == 0)
+                       wake_up_klogd();
        }
 }