Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux.git] / kernel / printk / printk.c

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 2f4af216bd6ef97f31b6ffcd0805a85ecfa652ee..247808333ba430f75c0ac7382bc08d6f219685cf 100644 (file)
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -1908,6 +1908,7 @@ asmlinkage int vprintk_emit(int facility, int level,
                preempt_enable();
        }
 
+       wake_up_klogd();
        return printed_len;
 }
 EXPORT_SYMBOL(vprintk_emit);
@@ -2289,9 +2290,7 @@ void console_unlock(void)
 {
        static char ext_text[CONSOLE_EXT_LOG_MAX];
        static char text[LOG_LINE_MAX + PREFIX_MAX];
-       static u64 seen_seq;
        unsigned long flags;
-       bool wake_klogd = false;
        bool do_cond_resched, retry;
 
        if (console_suspended) {
@@ -2335,11 +2334,6 @@ void console_unlock(void)
 
                printk_safe_enter_irqsave(flags);
                raw_spin_lock(&logbuf_lock);
-               if (seen_seq != log_next_seq) {
-                       wake_klogd = true;
-                       seen_seq = log_next_seq;
-               }
-
                if (console_seq < log_first_seq) {
                        len = sprintf(text, "** %u printk messages dropped **\n",
                                      (unsigned)(log_first_seq - console_seq));
@@ -2397,7 +2391,7 @@ void console_unlock(void)
 
                if (console_lock_spinning_disable_and_check()) {
                        printk_safe_exit_irqrestore(flags);
-                       goto out;
+                       return;
                }
 
                printk_safe_exit_irqrestore(flags);
@@ -2429,10 +2423,6 @@ void console_unlock(void)
 
        if (retry && console_trylock())
                goto again;
-
-out:
-       if (wake_klogd)
-               wake_up_klogd();
 }
 EXPORT_SYMBOL(console_unlock);