dirty fix to merging

1 files changed, 32 insertions, 0 deletions

diff --git a/lib/bust_spinlocks.c b/lib/bust_spinlocks.c
new file mode 100644
index 00000000..9681d54b
--- /dev/null
+++ b/lib/bust_spinlocks.c
@@ -0,0 +1,32 @@
+/*
+ * lib/bust_spinlocks.c
+ *
+ * Provides a minimal bust_spinlocks for architectures which don't have one of their own.
+ *
+ * bust_spinlocks() clears any spinlocks which would prevent oops, die(), BUG()
+ * and panic() information from reaching the user.
+ */
+
+#include <linux/kernel.h>
+#include <linux/spinlock.h>
+#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;
+	} else {
+#ifdef CONFIG_VT
+		unblank_screen();
+#endif
+		console_unblank();
+		if (--oops_in_progress == 0)
+			wake_up_klogd();
+	}
+}
+
+