summaryrefslogtreecommitdiff
path: root/kernel/printk.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/printk.c')
-rw-r--r--kernel/printk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/printk.c b/kernel/printk.c
index e2d0d491620..bf785e0ce73 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -1357,7 +1357,7 @@ static int console_trylock_for_printk(unsigned int cpu)
{
int retval = 0, wake = 0;
- if (console_trylock()) {
+ if (console_trylock() || oops_in_progress) {
retval = 1;
/*