diff --git a/[refs] b/[refs]
index d27bdfbccd5e..1a5d02378927 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b311e921b385b5a848f0806df16276aca1ecae07
+refs/heads/master: 004429956b4875e6bc2a31833f75363ce48cbea9
diff --git a/trunk/lib/bust_spinlocks.c b/trunk/lib/bust_spinlocks.c
index accb35658169..486da62b2b07 100644
--- a/trunk/lib/bust_spinlocks.c
+++ b/trunk/lib/bust_spinlocks.c
@@ -17,13 +17,13 @@
 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();
+		if (--oops_in_progress == 0)
+			wake_up_klogd();
 	}
 }