Merge branch 'linus' into x86/setup-lzma

Conflicts:
	init/do_mounts_rd.c

1 files changed, 2 insertions, 0 deletions

diff --git a/lib/bust_spinlocks.c b/lib/bust_spinlocks.c
index 486da62b2b07..9681d54b95d1 100644
--- a/lib/bust_spinlocks.c
+++ b/lib/bust_spinlocks.c
@@ -12,6 +12,7 @@
 #include <linux/tty.h>
 #include <linux/wait.h>
 #include <linux/vt_kern.h>
+#include <linux/console.h>
 
 
 void __attribute__((weak)) bust_spinlocks(int yes)
@@ -22,6 +23,7 @@ void __attribute__((weak)) bust_spinlocks(int yes)
 #ifdef CONFIG_VT
                 unblank_screen();
 #endif
+                console_unblank();
                 if (--oops_in_progress == 0)
                         wake_up_klogd();
         }