diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-23 11:04:08 +0200 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2012-02-15 10:32:37 -0600 |
commit | 11482fc6925d63da4d12510e90d85e69ea558640 (patch) | |
tree | 11eac6af7d8592f3a79ccec917b4324689ccb987 /arch/um | |
parent | a2e1475eff1ff781178cee3b87144438ca5f5234 (diff) |
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.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/um/kernel/early_printk.c b/arch/um/kernel/early_printk.c index ec649bf72f68..183060f76a11 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; } |