Skip to content

Commit

Permalink
[POWERPC] Fix console output getting dropped on platforms without udb…
Browse files Browse the repository at this point in the history
…g_putc

Previously, registering this early console would just result
in dropping early buffered printk output until a udbg_putc
was registered.

However, commit 69331af
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 <miltonm@bga.com>
Acked-by: Mark A. Greer <mgreer@mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Milton Miller authored and Paul Mackerras committed Jun 14, 2007
1 parent c63c4fa commit 220ddc0
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion arch/powerpc/kernel/udbg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 220ddc0

Please sign in to comment.