summaryrefslogtreecommitdiff
path: root/arch/um
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-07-23 09:04:08 (GMT)
committerScott Wood <scottwood@freescale.com>2013-04-04 22:09:05 (GMT)
commit90f73aa79422e1d1e69d2713a6153980f89e03c4 (patch)
treed375d0a2f9e01c3fd8a32a5dd9eba16e37de72bc /arch/um
parent639c3b9809d2202a2fd4c212d32d137d80c49fed (diff)
downloadlinux-fsl-qoriq-90f73aa79422e1d1e69d2713a6153980f89e03c4.tar.xz
early-printk-consolidate.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/kernel/early_printk.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/um/kernel/early_printk.c b/arch/um/kernel/early_printk.c
index 49480f0..4a0800b 100644
--- a/arch/um/kernel/early_printk.c
+++ b/arch/um/kernel/early_printk.c
@@ -16,7 +16,7 @@ static void early_console_write(struct console *con, const char *s, unsigned int
um_early_printk(s, n);
}
-static struct console early_console = {
+static struct console early_console_dev = {
.name = "earlycon",
.write = early_console_write,
.flags = CON_BOOT,
@@ -25,8 +25,10 @@ static struct console early_console = {
static int __init setup_early_printk(char *buf)
{
- register_console(&early_console);
-
+ if (!early_console) {
+ early_console = &early_console_dev;
+ register_console(&early_console_dev);
+ }
return 0;
}