Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6

1 files changed, 6 insertions, 0 deletions

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