evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PATCH] ppc64: iSeries early printk breakage

Browse source 
The earlier commit 8d92739186
(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: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Stephen Rothwell 2005-09-07 19:52:38 +10:00 • committed by Paul Mackerras
parent 34b5233f37
commit 38c0ff06d5
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/ppc64/kernel/udbg.c
View file

@ -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);
} }