The earlier commit 8d9273918635f0301368c01b56c03a6f339e8d51 (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 <[email protected]> --- arch/ppc64/kernel/udbg.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) -- Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/ 234f5032f6ccb4d72e4b74d33af55716b67d8a27 diff --git a/arch/ppc64/kernel/udbg.c b/arch/ppc64/kernel/udbg.c --- a/arch/ppc64/kernel/udbg.c +++ b/arch/ppc64/kernel/udbg.c @@ -158,14 +158,20 @@ static struct console udbg_console = { .index = -1, }; +static int early_console_initialized; + void __init disable_early_printk(void) { + if (!early_console_initialized) + return; unregister_console(&udbg_console); + early_console_initialized = 0; } /* called by setup_system */ void register_early_udbg_console(void) { + early_console_initialized = 1; register_console(&udbg_console); }
Attachment:
pgpcAOfK3TPMr.pgp
Description: PGP signature
- Follow-Ups:
- Re: [PATCH] ppc64: iSeries early printk breakage
- From: Milton Miller <[email protected]>
- Re: [PATCH] ppc64: iSeries early printk breakage
- Prev by Date: Re: [PATCH 01/11] memory hotplug prep: kill local_mapnr
- Next by Date: Re: kbuild & C++
- Previous by thread: ACPI causes sata timeout errors
- Next by thread: Re: [PATCH] ppc64: iSeries early printk breakage
- Index(es):
