Commit:     220ddc0847ebd42d18ee78c7e1c2f4c2e3be637d
Parent:     c63c4faa8cf055319c7ed557d2050c1c3776fac5
Author:     Milton Miller <[EMAIL PROTECTED]>
AuthorDate: Sun Jun 10 14:32:43 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Thu Jun 14 11:56:17 2007 +1000

    [POWERPC] Fix console output getting dropped on platforms without udbg_putc
    Previously, registering this early console would just result
    in dropping early buffered printk output until a udbg_putc
    was registered.
    However, commit 69331af79cf29e26d1231152a172a1a10c2df511
    clears the CON_PRINTBUFFER flag on the main console when a
    CON_BOOT (early) console has been registered, resulting in
    the buffered messages never being displayed to the user.
    This fixes the problem by making sure we don't register udbg_console
    on platforms that don't implement udbg_putc.
    Signed-off-by: Milton Miller <[EMAIL PROTECTED]>
    Acked-by: Mark A. Greer <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
 arch/powerpc/kernel/udbg.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/kernel/udbg.c b/arch/powerpc/kernel/udbg.c
index 87703df..cbca1df 100644
--- a/arch/powerpc/kernel/udbg.c
+++ b/arch/powerpc/kernel/udbg.c
@@ -151,12 +151,18 @@ static struct console udbg_console = {
 static int early_console_initialized;
-/* called by setup_system */
+ * 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 register_early_udbg_console(void)
        if (early_console_initialized)
+       if (!udbg_putc)
+               return;
        if (strstr(boot_command_line, "udbg-immortal")) {
                printk(KERN_INFO "early console immortal !\n");
                udbg_console.flags &= ~CON_BOOT;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to