Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

[firefly-linux-kernel-4.4.55.git] / kernel / printk.c

diff --git a/kernel/printk.c b/kernel/printk.c
index c2f720eb428304b297ae849322fd644215d9f405..f7aff4bd545457b230d0d20d94758b6a0fc1ea49 100644 (file)
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -51,10 +51,6 @@
 #define CREATE_TRACE_POINTS
 #include <trace/events/printk.h>
 
-#ifdef CONFIG_EARLY_PRINTK_DIRECT
-extern void printascii(char *);
-#endif
-
 /* printk's without a loglevel use this.. */
 #define DEFAULT_MESSAGE_LOGLEVEL CONFIG_DEFAULT_MESSAGE_LOGLEVEL
 
@@ -1373,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;
 }
 
@@ -1582,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;
 
@@ -2493,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;