summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-06-16 15:08:37 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-06-29 17:48:32 +1000
commitdd2e356a3dd1fea6d911798044532304c3ef4050 (patch)
tree3027ec252d362d6863ec34aa3594c69dfe1d7469
parent048bee7718bb3532aa96d0ce8572cced2ea951e6 (diff)
downloadblackbird-op-linux-dd2e356a3dd1fea6d911798044532304c3ef4050.tar.gz
blackbird-op-linux-dd2e356a3dd1fea6d911798044532304c3ef4050.zip
powerpc/udbg: Register udbg console generically
When CONFIG_PPC_EARLY_DEBUG is set, call register_early_udbg_console() early from generic code. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r--arch/powerpc/kernel/udbg.c2
-rw-r--r--arch/powerpc/platforms/pseries/lpar.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/udbg.c b/arch/powerpc/kernel/udbg.c
index 23d65abbedce..a57e61ea0558 100644
--- a/arch/powerpc/kernel/udbg.c
+++ b/arch/powerpc/kernel/udbg.c
@@ -68,6 +68,8 @@ void __init udbg_early_init(void)
#ifdef CONFIG_PPC_EARLY_DEBUG
console_loglevel = 10;
+
+ register_early_udbg_console();
#endif
}
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 39e6e0a7b2fa..e3a96c4348ab 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -193,8 +193,6 @@ void __init udbg_init_debug_lpar(void)
udbg_putc = udbg_putcLP;
udbg_getc = udbg_getcLP;
udbg_getc_poll = udbg_getc_pollLP;
-
- register_early_udbg_console();
}
/* returns 0 if couldn't find or use /chosen/stdout as console */
OpenPOWER on IntegriCloud