X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=kernel%2Fprintk.c;h=f7aff4bd545457b230d0d20d94758b6a0fc1ea49;hb=0a848fa4aaa30099fd8f80d475b2bb9d8f25e957;hp=cd0ee46eb894f3ade1c2f6fdf3752e6bd8e0c551;hpb=b738a3e88049258f2c3de4e3fcf181100cb558a5;p=firefly-linux-kernel-4.4.55.git

diff --git a/kernel/printk.c b/kernel/printk.c
index cd0ee46eb894..f7aff4bd5454 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -1369,9 +1369,9 @@ static int console_trylock_for_printk(unsigned int cpu)
 		}
 	}
 	logbuf_cpu = UINT_MAX;
+	raw_spin_unlock(&logbuf_lock);
 	if (wake)
 		up(&console_sem);
-	raw_spin_unlock(&logbuf_lock);
 	return retval;
 }
 
@@ -1578,10 +1578,6 @@ asmlinkage int vprintk_emit(int facility, int level,
 		}
 	}
 
-#ifdef CONFIG_EARLY_PRINTK_DIRECT
-	printascii(text);
-#endif
-
 	if (level == -1)
 		level = default_message_loglevel;
 
@@ -2489,7 +2485,7 @@ void wake_up_klogd(void)
 	preempt_enable();
 }
 
-int printk_sched(const char *fmt, ...)
+int printk_deferred(const char *fmt, ...)
 {
 	unsigned long flags;
 	va_list args;