Commit 38c0ff06 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras

[PATCH] ppc64: iSeries early printk breakage

The earlier commit 8d927391
(Consolidate early console and PPCDBG code) broke iSeries because
it caused unregister_console(&udbg_console) to be called
unconditionally.  iSeries never registers the udbg_console.

This just reverts part of the change.
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 34b5233f
...@@ -158,14 +158,20 @@ static struct console udbg_console = { ...@@ -158,14 +158,20 @@ static struct console udbg_console = {
.index = -1, .index = -1,
}; };
static int early_console_initialized;
void __init disable_early_printk(void) void __init disable_early_printk(void)
{ {
if (!early_console_initialized)
return;
unregister_console(&udbg_console); unregister_console(&udbg_console);
early_console_initialized = 0;
} }
/* called by setup_system */ /* called by setup_system */
void register_early_udbg_console(void) void register_early_udbg_console(void)
{ {
early_console_initialized = 1;
register_console(&udbg_console); register_console(&udbg_console);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment