13 files changed, 63 insertions, 109 deletions

diff --git a/arch/arm/kernel/early_printk.c b/arch/arm/kernel/early_printk.c
index 85aa2b292692..43076536965c 100644
--- a/arch/arm/kernel/early_printk.c
+++ b/arch/arm/kernel/early_printk.c
@@ -29,28 +29,17 @@ static void early_console_write(struct console *con, const char *s, unsigned n)
         early_write(s, n);
 }
 
-static struct console early_console = {
+static struct console early_console_dev = {
         .name =         "earlycon",
         .write =        early_console_write,
         .flags =        CON_PRINTBUFFER | CON_BOOT,
         .index =        -1,
 };
 
-asmlinkage void early_printk(const char *fmt, ...)
-{
-        char buf[512];
-        int n;
-        va_list ap;
-
-        va_start(ap, fmt);
-        n = vscnprintf(buf, sizeof(buf), fmt, ap);
-        early_write(buf, n);
-        va_end(ap);
-}
-
 static int __init setup_early_printk(char *buf)
 {
-        register_console(&early_console);
+        early_console = &early_console_dev;
+        register_console(&early_console_dev);
         return 0;
 }
 
diff --git a/arch/blackfin/kernel/early_printk.c b/arch/blackfin/kernel/early_printk.c
index 84ed8375113c..61fbd2de993d 100644
--- a/arch/blackfin/kernel/early_printk.c
+++ b/arch/blackfin/kernel/early_printk.c
@@ -25,8 +25,6 @@ extern struct console *bfin_earlyserial_init(unsigned int port,
 extern struct console *bfin_jc_early_init(void);
 #endif
 
-static struct console *early_console;
-
 /* Default console */
 #define DEFAULT_PORT 0
 #define DEFAULT_CFLAG CS8|B57600
diff --git a/arch/microblaze/kernel/early_printk.c b/arch/microblaze/kernel/early_printk.c
index 60dcacc68038..365f2d53f1b2 100644
--- a/arch/microblaze/kernel/early_printk.c
+++ b/arch/microblaze/kernel/early_printk.c
@@ -21,7 +21,6 @@
 #include <asm/setup.h>
 #include <asm/prom.h>
 
-static u32 early_console_initialized;
 static u32 base_addr;
 
 #ifdef CONFIG_SERIAL_UARTLITE_CONSOLE
@@ -109,27 +108,11 @@ static struct console early_serial_uart16550_console = {
 };
 #endif /* CONFIG_SERIAL_8250_CONSOLE */
 
-static struct console *early_console;
-
-void early_printk(const char *fmt, ...)
-{
-        char buf[512];
-        int n;
-        va_list ap;
-
-        if (early_console_initialized) {
-                va_start(ap, fmt);
-                n = vscnprintf(buf, 512, fmt, ap);
-                early_console->write(early_console, buf, n);
-                va_end(ap);
-        }
-}
-
 int __init setup_early_printk(char *opt)
 {
         int version = 0;
 
-        if (early_console_initialized)
+        if (early_console)
                 return 1;
 
         base_addr = of_early_console(&version);
@@ -159,7 +142,6 @@ int __init setup_early_printk(char *opt)
                 }
 
                 register_console(early_console);
-                early_console_initialized = 1;
                 return 0;
         }
         return 1;
@@ -169,7 +151,7 @@ int __init setup_early_printk(char *opt)
  * only for early console because of performance degression */
 void __init remap_early_printk(void)
 {
-        if (!early_console_initialized || !early_console)
+        if (!early_console)
                 return;
         pr_info("early_printk_console remapping from 0x%x to ", base_addr);
         base_addr = (u32) ioremap(base_addr, PAGE_SIZE);
@@ -194,9 +176,9 @@ void __init remap_early_printk(void)
 
 void __init disable_early_printk(void)
 {
-        if (!early_console_initialized || !early_console)
+        if (!early_console)
                 return;
         pr_warn("disabling early console\n");
         unregister_console(early_console);
-        early_console_initialized = 0;
+        early_console = NULL;
 }
diff --git a/arch/mips/kernel/early_printk.c b/arch/mips/kernel/early_printk.c
index 9e6440eaa455..505cb77d1280 100644
--- a/arch/mips/kernel/early_printk.c
+++ b/arch/mips/kernel/early_printk.c
@@ -7,7 +7,9 @@
  * Copyright (C) 2007 MIPS Technologies, Inc.
  *   written by Ralf Baechle (ralf@linux-mips.org)
  */
+#include <linux/kernel.h>
 #include <linux/console.h>
+#include <linux/printk.h>
 #include <linux/init.h>
 
 #include <asm/setup.h>
@@ -24,20 +26,18 @@ static void early_console_write(struct console *con, const char *s, unsigned n)
         }
 }
 
-static struct console early_console = {
+static struct console early_console_prom = {
         .name   = "early",
         .write  = early_console_write,
         .flags  = CON_PRINTBUFFER | CON_BOOT,
         .index  = -1
 };
 
-static int early_console_initialized __initdata;
-
 void __init setup_early_printk(void)
 {
-        if (early_console_initialized)
+        if (early_console)
                 return;
-        early_console_initialized = 1;
+        early_console = &early_console_prom;
 
-        register_console(&early_console);
+        register_console(&early_console_prom);
 }
diff --git a/arch/powerpc/kernel/udbg.c b/arch/powerpc/kernel/udbg.c
index f9748498fe58..13b867093499 100644
--- a/arch/powerpc/kernel/udbg.c
+++ b/arch/powerpc/kernel/udbg.c
@@ -156,15 +156,13 @@ static struct console udbg_console = {
         .index  = 0,
 };
 
-static int early_console_initialized;
-
 /*
  * Called by setup_system after ppc_md->probe and ppc_md->early_init.
  * Call it again after setting udbg_putc in ppc_md->setup_arch.
  */
 void __init register_early_udbg_console(void)
 {
-        if (early_console_initialized)
+        if (early_console)
                 return;
 
         if (!udbg_putc)
@@ -174,7 +172,7 @@ void __init register_early_udbg_console(void)
                 printk(KERN_INFO "early console immortal !\n");
                 udbg_console.flags &= ~CON_BOOT;
         }
-        early_console_initialized = 1;
+        early_console = &udbg_console;
         register_console(&udbg_console);
 }
 
diff --git a/arch/sh/kernel/sh_bios.c b/arch/sh/kernel/sh_bios.c
index 47475cca068a..fe584e516964 100644
--- a/arch/sh/kernel/sh_bios.c
+++ b/arch/sh/kernel/sh_bios.c
@@ -104,6 +104,7 @@ void sh_bios_vbr_reload(void)
                 );
 }
 
+#ifdef CONFIG_EARLY_PRINTK
 /*
  *      Print a string through the BIOS
  */
@@ -144,8 +145,6 @@ static struct console bios_console = {
         .index          = -1,
 };
 
-static struct console *early_console;
-
 static int __init setup_early_printk(char *buf)
 {
         int keep_early = 0;
@@ -170,3 +169,4 @@ static int __init setup_early_printk(char *buf)
         return 0;
 }
 early_param("earlyprintk", setup_early_printk);
+#endif
diff --git a/arch/tile/kernel/early_printk.c b/arch/tile/kernel/early_printk.c
index afb9c9a0d887..34d72a151bf3 100644
--- a/arch/tile/kernel/early_printk.c
+++ b/arch/tile/kernel/early_printk.c
@@ -17,6 +17,7 @@
 #include <linux/init.h>
 #include <linux/string.h>
 #include <linux/irqflags.h>
+#include <linux/printk.h>
 #include <asm/setup.h>
 #include <hv/hypervisor.h>
 
@@ -33,25 +34,8 @@ static struct console early_hv_console = {
 };
 
 /* Direct interface for emergencies */
-static struct console *early_console = &early_hv_console;
-static int early_console_initialized;
 static int early_console_complete;
 
-static void early_vprintk(const char *fmt, va_list ap)
-{
-        char buf[512];
-        int n = vscnprintf(buf, sizeof(buf), fmt, ap);
-        early_console->write(early_console, buf, n);
-}
-
-void early_printk(const char *fmt, ...)
-{
-        va_list ap;
-        va_start(ap, fmt);
-        early_vprintk(fmt, ap);
-        va_end(ap);
-}
-
 void early_panic(const char *fmt, ...)
 {
         va_list ap;
@@ -69,14 +53,13 @@ static int __initdata keep_early;
 
 static int __init setup_early_printk(char *str)
 {
-        if (early_console_initialized)
+        if (early_console)
                 return 1;
 
         if (str != NULL && strncmp(str, "keep", 4) == 0)
                 keep_early = 1;
 
         early_console = &early_hv_console;
-        early_console_initialized = 1;
         register_console(early_console);
 
         return 0;
@@ -85,12 +68,12 @@ static int __init setup_early_printk(char *str)
 void __init disable_early_printk(void)
 {
         early_console_complete = 1;
-        if (!early_console_initialized || !early_console)
+        if (!early_console)
                 return;
         if (!keep_early) {
                 early_printk("disabling early console\n");
                 unregister_console(early_console);
-                early_console_initialized = 0;
+                early_console = NULL;
         } else {
                 early_printk("keeping early console\n");
         }
@@ -98,7 +81,7 @@ void __init disable_early_printk(void)
 
 void warn_early_printk(void)
 {
-        if (early_console_complete || early_console_initialized)
+        if (early_console_complete || early_console)
                 return;
         early_printk("\
 Machine shutting down before console output is fully initialized.\n\
diff --git a/arch/um/kernel/early_printk.c b/arch/um/kernel/early_printk.c
index 49480f092456..4a0800bc37b2 100644
--- a/arch/um/kernel/early_printk.c
+++ b/arch/um/kernel/early_printk.c
@@ -16,7 +16,7 @@ static void early_console_write(struct console *con, const char *s, unsigned int
         um_early_printk(s, n);
 }
 
-static struct console early_console = {
+static struct console early_console_dev = {
         .name = "earlycon",
         .write = early_console_write,
         .flags = CON_BOOT,
@@ -25,8 +25,10 @@ static struct console early_console = {
 
 static int __init setup_early_printk(char *buf)
 {
-        register_console(&early_console);
-
+        if (!early_console) {
+                early_console = &early_console_dev;
+                register_console(&early_console_dev);
+        }
         return 0;
 }
 
diff --git a/arch/unicore32/kernel/early_printk.c b/arch/unicore32/kernel/early_printk.c
index 3922255f1fa8..9be0d5d02a9a 100644
--- a/arch/unicore32/kernel/early_printk.c
+++ b/arch/unicore32/kernel/early_printk.c
@@ -33,21 +33,17 @@ static struct console early_ocd_console = {
         .index =        -1,
 };
 
-/* Direct interface for emergencies */
-static struct console *early_console = &early_ocd_console;
-
-static int __initdata keep_early;
-
 static int __init setup_early_printk(char *buf)
 {
-        if (!buf)
+        int keep_early;
+
+        if (!buf || early_console)
                 return 0;
 
         if (strstr(buf, "keep"))
                 keep_early = 1;
 
-        if (!strncmp(buf, "ocd", 3))
-                early_console = &early_ocd_console;
+        early_console = &early_ocd_console;
 
         if (keep_early)
                 early_console->flags &= ~CON_BOOT;
diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
index 9b9f18b49918..d15f575a861b 100644
--- a/arch/x86/kernel/early_printk.c
+++ b/arch/x86/kernel/early_printk.c
@@ -169,25 +169,9 @@ static struct console early_serial_console = {
         .index =        -1,
 };
 
-/* Direct interface for emergencies */
-static struct console *early_console = &early_vga_console;
-static int __initdata early_console_initialized;
-
-asmlinkage void early_printk(const char *fmt, ...)
-{
-        char buf[512];
-        int n;
-        va_list ap;
-
-        va_start(ap, fmt);
-        n = vscnprintf(buf, sizeof(buf), fmt, ap);
-        early_console->write(early_console, buf, n);
-        va_end(ap);
-}
-
 static inline void early_console_register(struct console *con, int keep_early)
 {
-        if (early_console->index != -1) {
+        if (con->index != -1) {
                 printk(KERN_CRIT "ERROR: earlyprintk= %s already used\n",
                        con->name);
                 return;
@@ -207,9 +191,8 @@ static int __init setup_early_printk(char *buf)
         if (!buf)
                 return 0;
 
-        if (early_console_initialized)
+        if (early_console)
                 return 0;
-        early_console_initialized = 1;
 
         keep = (strstr(buf, "keep") != NULL);
 
diff --git a/include/linux/console.h b/include/linux/console.h
index 29680a8cda99..73bab0f58af5 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -141,6 +141,7 @@ struct console {
         for (con = console_drivers; con != NULL; con = con->next)
 
 extern int console_set_on_cmdline;
+extern struct console *early_console;
 
 extern int add_preferred_console(char *name, int idx, char *options);
 extern int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, char *options);
diff --git a/include/linux/printk.h b/include/linux/printk.h
index 822171fcb1c8..1c35c23bccd7 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -95,8 +95,14 @@ int no_printk(const char *fmt, ...)
         return 0;
 }
 
+#ifdef CONFIG_EARLY_PRINTK
 extern asmlinkage __printf(1, 2)
 void early_printk(const char *fmt, ...);
+void early_vprintk(const char *fmt, va_list ap);
+#else
+static inline __printf(1, 2) __cold
+void early_printk(const char *s, ...) { }
+#endif
 
 #ifdef CONFIG_PRINTK
 asmlinkage __printf(5, 0)
diff --git a/kernel/printk.c b/kernel/printk.c
index 2de593df036b..1c8ca176458f 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
 
@@ -1723,6 +1716,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)
 {