1 files changed, 26 insertions, 9 deletions

diff --git a/kernel/printk.c b/kernel/printk.c
index abbdd9e2ac82..376914e2869d 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -49,13 +49,6 @@
 #define CREATE_TRACE_POINTS
 #include <trace/events/printk.h>
 
-/*
- * Architectures can override it:
- */
-void asmlinkage __attribute__((weak)) early_printk(const char *fmt, ...)
-{
-}
-
 /* printk's without a loglevel use this.. */
 #define DEFAULT_MESSAGE_LOGLEVEL CONFIG_DEFAULT_MESSAGE_LOGLEVEL
 
@@ -608,7 +601,8 @@ static unsigned int devkmsg_poll(struct file *file, poll_table *wait)
                 /* return error when data has vanished underneath us */
                 if (user->seq < log_first_seq)
                         ret = POLLIN|POLLRDNORM|POLLERR|POLLPRI;
-                ret = POLLIN|POLLRDNORM;
+                else
+                        ret = POLLIN|POLLRDNORM;
         }
         raw_spin_unlock_irq(&logbuf_lock);
 
@@ -1265,7 +1259,7 @@ static void call_console_drivers(int level, const char *text, size_t len)
 {
         struct console *con;
 
-        trace_console(text, 0, len, len);
+        trace_console(text, len);
 
         if (level >= console_loglevel && !ignore_loglevel)
                 return;
@@ -1723,6 +1717,29 @@ static size_t cont_print_text(char *text, size_t size) { return 0; }
 
 #endif /* CONFIG_PRINTK */
 
+#ifdef CONFIG_EARLY_PRINTK
+struct console *early_console;
+
+void early_vprintk(const char *fmt, va_list ap)
+{
+        if (early_console) {
+                char buf[512];
+                int n = vscnprintf(buf, sizeof(buf), fmt, ap);
+
+                early_console->write(early_console, buf, n);
+        }
+}
+
+asmlinkage void early_printk(const char *fmt, ...)
+{
+        va_list ap;
+
+        va_start(ap, fmt);
+        early_vprintk(fmt, ap);
+        va_end(ap);
+}
+#endif
+
 static int __add_preferred_console(char *name, int idx, char *options,
                                    char *brl_options)
 {