From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 7 Sep 2005 09:52:38 +0000 (+1000)
Subject: [PATCH] ppc64: iSeries early printk breakage
X-Git-Tag: v2.6.14-rc1~482^2~11
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=38c0ff06d5ba05b6fbf18652c49747ad320aaeb0;p=linux-2.6-omap-h63xx.git

[PATCH] ppc64: iSeries early printk breakage

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 <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/ppc64/kernel/udbg.c b/arch/ppc64/kernel/udbg.c
index ed6766e21f5..d49c3613c8e 100644
--- 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);
 }