Merge git://git.infradead.org/battery-2.6

[linux-2.6-omap-h63xx.git] / arch / mips / kernel / early_printk.c

diff --git a/arch/mips/kernel/early_printk.c b/arch/mips/kernel/early_printk.c
index 4fa54b230c098ab39c75e07bec68cbf720d15f21..9ae813eb782e9cebe160df532b113e456d7fe799 100644 (file)
--- a/arch/mips/kernel/early_printk.c
+++ b/arch/mips/kernel/early_printk.c
@@ -10,9 +10,12 @@
 #include <linux/console.h>
 #include <linux/init.h>
 
+#include <asm/setup.h>
+
 extern void prom_putchar(char);
 
-static void early_console_write(struct console *con, const char *s, unsigned n)
+static void __init
+early_console_write(struct console *con, const char *s, unsigned n)
 {
        while (n-- && *s) {
                if (*s == '\n')
@@ -22,14 +25,20 @@ static void early_console_write(struct console *con, const char *s, unsigned n)
        }
 }
 
-static struct console early_console = {
+static struct console early_console __initdata = {
        .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)
+               return;
+       early_console_initialized = 1;
+
        register_console(&early_console);
 }