From 1f09a41dc67b93b084be152d672a8e17b3de0176 Mon Sep 17 00:00:00 2001 From: Milton Miller Date: Sun, 10 Jun 2007 14:32:43 +1000 Subject: [PATCH] --- yaml --- r: 57773 b: refs/heads/master c: 220ddc0847ebd42d18ee78c7e1c2f4c2e3be637d h: refs/heads/master i: 57771: ff0ae662b063239530ec44f437700870f8049632 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/udbg.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f56867dab4ee..69f0f282039f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c63c4faa8cf055319c7ed557d2050c1c3776fac5 +refs/heads/master: 220ddc0847ebd42d18ee78c7e1c2f4c2e3be637d diff --git a/trunk/arch/powerpc/kernel/udbg.c b/trunk/arch/powerpc/kernel/udbg.c index 87703df87509..cbca1df8bc60 100644 --- a/trunk/arch/powerpc/kernel/udbg.c +++ b/trunk/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) return; + if (!udbg_putc) + return; + if (strstr(boot_command_line, "udbg-immortal")) { printk(KERN_INFO "early console immortal !\n"); udbg_console.flags &= ~CON_BOOT;