From f206572fe332fc109afe93a2da8344aa1a5df2aa Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@au1.ibm.com>
Date: Wed, 7 Jun 2006 12:06:20 +1000
Subject: [PATCH] --- yaml --- r: 28740 b: refs/heads/master c:
 3b5e905ee3bd23e9311951890aba57a0dbc81ca4 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/powerpc/kernel/udbg.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f32f63adc735..e767d2d4c25a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e78dbc800c37f035d476c4fdebdf43cdecfcb731
+refs/heads/master: 3b5e905ee3bd23e9311951890aba57a0dbc81ca4
diff --git a/trunk/arch/powerpc/kernel/udbg.c b/trunk/arch/powerpc/kernel/udbg.c
index 3774e80094f5..67d9fd9ae2b5 100644
--- a/trunk/arch/powerpc/kernel/udbg.c
+++ b/trunk/arch/powerpc/kernel/udbg.c
@@ -14,6 +14,7 @@
 #include <linux/types.h>
 #include <linux/sched.h>
 #include <linux/console.h>
+#include <linux/init.h>
 #include <asm/processor.h>
 #include <asm/udbg.h>
 
@@ -141,12 +142,14 @@ static int early_console_initialized;
 
 void __init disable_early_printk(void)
 {
-#if 1
 	if (!early_console_initialized)
 		return;
+	if (strstr(saved_command_line, "udbg-immortal")) {
+		printk(KERN_INFO "early console immortal !\n");
+		return;
+	}
 	unregister_console(&udbg_console);
 	early_console_initialized = 0;
-#endif
 }
 
 /* called by setup_system */