projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'kumar/merge' into merge
[firefly-linux-kernel-4.4.55.git]
/
lib
/
bust_spinlocks.c
diff --git
a/lib/bust_spinlocks.c
b/lib/bust_spinlocks.c
index 486da62b2b070368f30d53b8feb2de33f0a5167a..9681d54b95d127878405d5ff0afec6fcc575fbae 100644
(file)
--- 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/tty.h>
#include <linux/wait.h>
#include <linux/vt_kern.h>
+#include <linux/console.h>
void __attribute__((weak)) bust_spinlocks(int yes)
void __attribute__((weak)) bust_spinlocks(int yes)
@@
-22,6
+23,7
@@
void __attribute__((weak)) bust_spinlocks(int yes)
#ifdef CONFIG_VT
unblank_screen();
#endif
#ifdef CONFIG_VT
unblank_screen();
#endif
+ console_unblank();
if (--oops_in_progress == 0)
wake_up_klogd();
}
if (--oops_in_progress == 0)
wake_up_klogd();
}