From cd29973fc42d70a7cdc477694b9b43ffff5b757c Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 7 Sep 2005 19:52:38 +1000
Subject: [PATCH] --- yaml --- r: 8044 b: refs/heads/master c:
 38c0ff06d5ba05b6fbf18652c49747ad320aaeb0 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/ppc64/kernel/udbg.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 51d0b438255a..eb25c5715f9d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34b5233f379847097a1925a02b62f129c407c1e4
+refs/heads/master: 38c0ff06d5ba05b6fbf18652c49747ad320aaeb0
diff --git a/trunk/arch/ppc64/kernel/udbg.c b/trunk/arch/ppc64/kernel/udbg.c
index ed6766e21f5a..d49c3613c8ec 100644
--- a/trunk/arch/ppc64/kernel/udbg.c
+++ b/trunk/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);
 }