Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / arch / powerpc / kernel / udbg.c

diff --git a/arch/powerpc/kernel/udbg.c b/arch/powerpc/kernel/udbg.c
index 7aad620..fc9af47 100644 (file)
--- a/arch/powerpc/kernel/udbg.c
+++ b/arch/powerpc/kernel/udbg.c
@@ -18,6 +18,7 @@
 #include <asm/udbg.h>
 
 void (*udbg_putc)(char c);
+void (*udbg_flush)(void);
 int (*udbg_getc)(void);
 int (*udbg_getc_poll)(void);
 
@@ -76,6 +77,9 @@ void udbg_puts(const char *s)
                        while ((c = *s++) != '\0')
                                udbg_putc(c);
                }
+
+               if (udbg_flush)
+                       udbg_flush();
        }
 #if 0
        else {
@@ -98,6 +102,9 @@ int udbg_write(const char *s, int n)
                }
        }
 
+       if (udbg_flush)
+               udbg_flush();
+
        return n - remain;
 }
 
@@ -154,8 +161,8 @@ static void udbg_console_write(struct console *con, const char *s,
 static struct console udbg_console = {
        .name   = "udbg",
        .write  = udbg_console_write,
-       .flags  = CON_PRINTBUFFER | CON_ENABLED | CON_BOOT,
-       .index  = -1,
+       .flags  = CON_PRINTBUFFER | CON_ENABLED | CON_BOOT | CON_ANYTIME,
+       .index  = 0,
 };
 
 static int early_console_initialized;